summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Fix Error 500 after renaming a project pathStan Hu2016-04-051-0/+3
| | |/ / | |/| | | | | | | | | | Closes #14885
* | | | Respond 404 when unauthorized user imports membersfix/permissions-when-importing-membersGrzegorz Bizon2016-04-051-1/+1
| | | |
* | | | Do not leak project exists when importing membersGrzegorz Bizon2016-04-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | When importing members, and user does not have permissions to read members in a source project, do not leak information about source project existence. Notifiy user that project has not been found instead.
* | | | Check permissions when importing project membersGrzegorz Bizon2016-04-051-2/+7
|/ / / | | | | | | | | | Closes #14899
* | | Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove fork link closes all merge requests opened on source project Currently, if you: - create a fork - open a merge request on the source project - remove the fork link The created MR cannot be closed. With this MR, all pending MR is closed when the fork link is removed. See merge request !3189
| * | | Move unlink fork logic to a serviceBaldinof2016-03-221-1/+1
| | | |
| * | | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-147-35/+48
| |\ \ \
| * | | | Close merge requests when removing fork relationBaldinof2016-03-111-1/+1
| | | | |
* | | | | Merge branch 'build-updates' into 'master' Douwe Maan2016-04-031-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build updates Fixes #10851 ![build-updates](/uploads/52e09e679ca457f3d818f9a12fd8382b/build-updates.gif) See merge request !2604
| * | | | | Merge request title is in the notificationPhil Hughes2016-03-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Short commit instead of long commit sha
| * | | | | Commit SHA comes from JSONPhil Hughes2016-03-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Removed page refresh - instead clicking takes to the builds tab
| * | | | | Fix code style issues.Jacob Schatz2016-03-181-3/+3
| | | | | |
| * | | | | Removes name from fileJacob Schatz2016-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Changes `:not_found` to `nil`
| * | | | | Adds notifications API to MR page.Jacob Schatz2016-03-181-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a build status changes a notification will popup. Fixes #10851
| * | | | | Adds JSON callback, which is currently not working.Jacob Schatz2016-03-181-2/+9
| | | | | |
| * | | | | initial ajax buildJacob Schatz2016-03-181-1/+2
| | | | | |
* | | | | | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
* | | | | | Merge branch 'precompile-emoji-urls' into 'master' Dmitriy Zaporozhets2016-03-301-12/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-calculate Emoji digests cc @dzaporozhets @rspeicher @marin Do you happen to know if we allow users to configure asset hosts anywhere in Omnibus and such? I've not been able to find any reference to "asset_host" so it seems we don't allow this (which is a good thing as this simplifies the code). See merge request !3458
| * | | | | | Pre-calculate Emoji digestsprecompile-emoji-urlsYorick Peterse2016-03-301-12/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By pre-calculating the digests we can manually construct the emoji URLs, removing the need for using Rails' asset URL helpers. The reason we don't want to use these helpers for Emojis is two-fold: 1. Rails' image_url() method is slow, really slow. For one it _might_ have to calculate digests but it also performs a lot of other intensive operations (judging by the source code and based on measuring timings). 2. We have a lot of Emoji which coupled with the above can result in it taking minutes to load Emoji autocomplete data. Using this pre-calculation setup generating the digests takes around 7 seconds (including the time it takes to start Rails/Rake), and only around 600 milliseconds to load _all_ the autocomplete data of a project (measured locally). This commit _does_ change the Emoji URLs from absolute to relative URLs as these are much easier to generate. To update the Emoji data simply run: rake gemojione:digests Then commit any changes. Fixes gitlab-org/gitlab-ce#14009
* | | | | | Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-301-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Raw / Rendered diff producing different results on merge requests The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`. Fixes #14680, #3017 See merge request !3450
| * | | | | | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-291-2/+2
| | | | | | |
* | | | | | | Merge branch 'refactor/project-badges-interface' into 'master' Robert Speicher2016-03-301-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor builds badge, encapsulate inside a class This merge requests attempts to introduce interface for all badges. Currently we only have a build badge, but other badges are in plans, like coverage badge. See merge request !3403
| * | | | | | Refactor builds badge, encapsulate inside a classGrzegorz Bizon2016-03-291-2/+3
| | | | | | |
* | | | | | | Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Standardised the output of the JSON to always include the namePhil Hughes2016-03-291-1/+1
| |/ / / / |/| | | | | | | | | | | | | | The frontend will then always use the name as the ID - like previous
* | | | | Merge branch 'fix/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-291-1/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when visiting CI root path Closes #14528, closes #14687 See merge request !3377
| * | | | | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-291-0/+4
| | | | | |
| * | | | | Add definition of before action that has been movedGrzegorz Bizon2016-03-251-1/+5
| |/ / / / | | | | | | | | | | | | | | | Closes #14528
* | | | | Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-291-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
| * | | | | Ensure project snippets have their own access levelRémy Coutable2016-03-251-1/+1
| | | | | |
| * | | | | Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-251-1/+5
| |/ / / / | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
* | | | | Merge branch 'functional-sidebar' into 'master' Dmitriy Zaporozhets2016-03-283-10/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates sidebar to use new dropdowns for issues and merge requests Fixes #12935, #13164 See merge request !3175
| * | | | | Edit button leaves modal openJacob Schatz2016-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add user avatar to user selection
| * | | | | Remove unnecessary sentenceAlfredo Sumaran2016-03-251-1/+0
| | | | | |
| * | | | | New dropdowns work on merge requests too!Jacob Schatz2016-03-251-4/+1
| | | | | |
| * | | | | Adds new dropdown ajax to user selectionJacob Schatz2016-03-251-1/+1
| | | | | |
| * | | | | Add labels as proper POST arrays using new dropdownJacob Schatz2016-03-251-1/+7
| | | | | |
| * | | | | Add milestone sidebar update via JSONJacob Schatz2016-03-251-1/+1
| | | | | |
| * | | | | Ajax call to milestones via new dropdownsJacob Schatz2016-03-251-1/+1
| | | | | |
| * | | | | Sidebar milestone updatable via JSONJacob Schatz2016-03-252-5/+1
| | | | | |
| * | | | | Updates sidebar milestone to use new dropdownsJacob Schatz2016-03-251-0/+1
| |/ / / /
* | | | | Implementing 'Groups View' and 'TODOs View' as options for dashboard ↵Elias Werberich2016-03-241-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | preferences. Fixes #14585.
* | | | Merge branch 'issue_7959' into 'master' Jacob Schatz2016-03-231-8/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crop avatars on the client before upload <img src="/uploads/535d69956cc5904870ae5d95132a35af/Screen_Shot_2016-03-17_at_9.55.56_AM.png" width="700"> closes #7959 closes #600 See merge request !3270
| * \ \ \ Merge branch 'master' into issue_7959Alfredo Sumaran2016-03-2241-176/+244
| |\ \ \ \
| * | | | | Respond to json requestsAlfredo Sumaran2016-03-171-8/+9
| | |/ / / | |/| | |
* | | | | Add missing Dashboard::LabelsControllerRémy Coutable2016-03-231-0/+9
| | | | |
* | | | | Use respond_to instead of a conditional to paginate milestonesRémy Coutable2016-03-233-8/+9
| | | | |
* | | | | Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-234-35/+17
| |/ / / |/| | |
* | | | Address feedbackDouwe Maan2016-03-222-2/+3
| | | |
* | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-2129-37/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
View Lorry Controller Status