summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Eager load project creators for project dashboardsdashboard-projects-controller-query-performanceYorick Peterse2017-08-071-2/+4
* Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-031-2/+2
* Fix Issue board when using Ruby 2.435769-fix-ruby-2-4-compatibilityRémy Coutable2017-08-011-1/+2
* Add option to use CommitLanguages RPCJacob Vosmaer2017-08-011-17/+1
* Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-1/+21
|\
| * Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-1/+21
* | Merge branch '26890-sort-branches' into 'master'Rémy Coutable2017-07-281-1/+1
|\ \
| * | WIP: This makes the default sort order for branches 'recently updated' rather...26890-sort-branchesMatt Lee2017-01-201-1/+1
* | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-6/+1
|\ \ \
| * | | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-6/+1
| | |/ | |/|
* | | Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern2017-07-281-0/+10
|\ \ \
| * | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-281-0/+10
* | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-281-4/+1
|\ \ \ \ | |/ / / |/| | |
| * | | refactor async calendar dataMike Greiling2017-07-181-4/+1
* | | | Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-271-78/+3
|\ \ \ \
| * | | | Make the attribute list for application settings reusableBob Van Landuyt2017-07-271-78/+3
| | |/ / | |/| |
* | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-1/+4
|\ \ \ \
| * \ \ \ Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23172-2227/+3545
| |\ \ \ \
| * | | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-1/+4
* | | | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-271-1/+1
|\ \ \ \ \ \
| * | | | | | Use params#require instead params[] accessOswaldo Ferreira2017-07-271-1/+1
| * | | | | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-1/+1
| | |_|/ / / | |/| | | |
* | | | | | extract setter as before_actionAlexis Reigel2017-07-271-4/+8
* | | | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-271-10/+30
* | | | | | user may now revoke a gpg keyAlexis Reigel2017-07-271-0/+10
* | | | | | add profile gpg key page to manage gpg keysAlexis Reigel2017-07-271-0/+33
|/ / / / /
* | | | | Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann2017-07-261-0/+6
* | | | | Merge branch '35453-pending-delete-projects-error-in-admin-dashboard-fix' int...Sean McGivern2017-07-261-1/+1
|\ \ \ \ \
| * | | | | Fixes 500 error caused by pending delete projects in admin dashboard35453-pending-delete-projects-error-in-admin-dashboard-fixTiago Botelho2017-07-251-1/+1
* | | | | | Merge branch 'backport-ee-2328' into 'master'Sean McGivern2017-07-253-4/+5
|\ \ \ \ \ \
| * | | | | | Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...Nick Thomas2017-07-213-4/+5
* | | | | | | Merge branch 'bvl-fix-login-issue-with-ldap-enabled' into 'master'Robert Speicher2017-07-241-0/+8
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Explicitly add `protect_from_forgery` actionBob Van Landuyt2017-07-241-0/+8
* | | | | | | Merge branch '33097-issue-tracker' into 'master'Sean McGivern2017-07-241-5/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-241-4/+0
| * | | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-241-5/+8
| | |_|/ / / | |/| | | |
* | | | | | Decrease ABC threshold to 56.96Maxim Rydkin2017-07-241-12/+3
|/ / / / /
* | | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-212-4/+4
|/ / / /
* | | | Wrong data type when testing webhooksAlexander Randa2017-07-205-28/+20
* | | | Merge branch '33303-404-for-unauthorized-project' into 'security-9-3'Sean McGivern2017-07-191-0/+10
* | | | Merge branch 'clear-issuable-count-cache-for-states' into 'master'Robert Speicher2017-07-191-6/+2
|\ \ \ \
| * | | | Fix issuable state cachingSean McGivern2017-07-191-6/+2
| | |/ / | |/| |
* | | | Fix external issue trackers redirectissue_35132Felipe Artur2017-07-181-1/+1
|/ / /
* | | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-141-1/+1
|\ \ \
| * | | Update sessions metric name.Ben Kochie2017-07-121-1/+1
* | | | Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-sear...Sean McGivern2017-07-141-2/+2
|\ \ \ \
| * | | | Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-141-2/+2
* | | | | Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-142-6/+16
* | | | | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' int...Sean McGivern2017-07-141-0/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Recover from renaming project that has container imagesGrzegorz Bizon2017-07-131-0/+3
| |/ / /
View Lorry Controller Status