- 02 7月, 2016 2 次提交
-
-
由 Grzegorz Bizon 提交于
-
由 Rémy Coutable 提交于
The issue was that @notes were not passed to Banzai::NoteRenderer.render in Projects::SnippetsController#show. This was forgotten in d470f3d1. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
- 01 7月, 2016 3 次提交
-
-
由 Josh Frye 提交于
-
由 Rémy Coutable 提交于
Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Eric K Idema 提交于
This stands as an alternative to using OAuth to access a user's Github repositories. This is setup in such a way that it can be used without OAuth configuration. From a UI perspective, the how to import modal has been replaced by a full page, which includes a form for posting a personal access token back to the Import::GithubController. If the user has logged in via GitHub, skip the Personal Access Token and go directly to Github for an access token via OAuth.
-
- 30 6月, 2016 2 次提交
-
-
由 Alejandro Rodríguez 提交于
-
由 Josh Frye 提交于
-
- 29 6月, 2016 7 次提交
-
-
由 Paco Guzman 提交于
Only needed when the project view is ‘Files view’
-
由 Grzegorz Bizon 提交于
-
由 Lin Jen-Shin 提交于
If we're using `can?` it would look weird to use 409
-
由 Josh Frye 提交于
-
由 Josh Frye 提交于
-
由 Josh Frye 提交于
-
由 Josh Frye 提交于
-
- 28 6月, 2016 5 次提交
-
-
由 Z.J. van de Weg 提交于
Depends on the changes in Workhorse (gitlab-org/gitlab-workhorse!48).
-
由 Lin Jen-Shin 提交于
And show information about locked status. Help! This looks bad :o
-
由 Lin Jen-Shin 提交于
Because invalid actions shouldn't be shown on the page.
-
由 Lin Jen-Shin 提交于
The regression was introduced by: https://gitlab.com/gitlab-org/gitlab-ce/commit/1b8f52d9206bdf19c0dde04505c4c0b1cf46cfbe I did that because there's a test specifying that a shared runner cannot be enabled, in the API. So I assume that is the case for non-admin, but admins should be able to do so anyway. Also added a test to make sure this won't regress again. Closes #19039
-
由 Douwe Maan 提交于
-
- 25 6月, 2016 4 次提交
-
-
由 Ruben Davila 提交于
This will avoid application errors generated by the assumption of the presence of these params.
-
由 Felipe Artur 提交于
-
由 Felipe Artur 提交于
-
由 Rémy Coutable 提交于
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true The issue was that `MergeRequest#mergeable?` returns false when the CI state is not success and project.only_allow_merge_if_build_succeeds is true. In this case `Projects::MergeRequestsController#merge` would return the `:failed` status when enabling `merge_when_build_succeeds`, thus leading to a weird state and the MR never automatically merged. The fix is to disable the CI state check in the controller safeguard that early return the `:failed` status. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
- 24 6月, 2016 5 次提交
-
-
由 Rémy Coutable 提交于
The issue was with the `User#groups` and `User#projects` associations which goes through the `User#group_members` and `User#project_members`. Initially I chose to use a secure approach by storing the requester's user ID in `Member#created_by_id` instead of `Member#user_id` because I was aware that there was a security risk since I didn't know the codebase well enough. Then during the review, we decided to change that and directly store the requester's user ID into `Member#user_id` (for the sake of simplifying the code I believe), meaning that every `group_members` / `project_members` association would include the requesters by default... My bad for not checking that all the `group_members` / `project_members` associations and the ones that go through them (e.g. `Group#users` and `Project#users`) were made safe with the `where(requested_at: nil)` / `where(members: { requested_at: nil })` scopes. Now they are all secure. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Yorick Peterse 提交于
This commit changes the way certain documents are rendered (currently only Notes) and how documents are redacted. Previously both rendering and redacting would run on a per document basis. The result of this was that for every document we'd have to run countless queries just to figure out if we could display a set of links or not. This commit changes things around so that redacting Markdown documents is no longer tied into the html-pipeline Gem. This in turn allows it to redact multiple documents in a single pass, thus reducing the number of queries needed. In turn rendering issue/merge request notes has been adjusted to take advantage of this new setup. Instead of rendering Markdown somewhere deep down in a view the Markdown is rendered and redacted in the controller (taking the current user and all that into account). This has been done in such a way that the "markdown()" helper method can still be used on its own. This particular commit also paves the way for caching rendered HTML on object level. Right now there's an accessor method Note#note_html which is used for setting/getting the rendered HTML. Once we cache HTML on row level we can simply change this field to be a column and call a "save" whenever needed and we're pretty much done.
-
由 James Lopez 提交于
-
由 James Lopez 提交于
Fix tmp file being deleted after the request plus some cleanup and improved erroring for this situation
-
由 Paco Guzman 提交于
-
- 23 6月, 2016 1 次提交
-
-
由 Z.J. van de Weg 提交于
-
- 22 6月, 2016 2 次提交
-
-
由 Felipe Artur 提交于
-
由 Felipe Artur 提交于
-
- 21 6月, 2016 3 次提交
-
-
由 Grzegorz Bizon 提交于
-
由 Paco Guzman 提交于
-
由 Paco Guzman 提交于
-
- 20 6月, 2016 3 次提交
-
-
由 Phil Hughes 提交于
Added tests to project controller
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Lin Jen-Shin 提交于
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12563922 For clarification and consistency
-
- 19 6月, 2016 3 次提交
-
-
由 Phil Hughes 提交于
-
由 Phil Hughes 提交于
Removes un-used method Fixes other Ruby issues
-
由 Phil Hughes 提交于
-