summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Undo changes; reduce sidebar internal width17338-sidebar-widthAnnabel Dunstone2016-05-121-9/+4
* No extra link padding at xs screen sizeAnnabel Dunstone2016-05-101-2/+4
* Reduce width of side navAnnabel Dunstone2016-05-102-5/+8
* Merge branch 'fix-r-shortcut' into 'master' Jacob Schatz2016-05-101-0/+4
|\
| * Restore "r" shortcutfix-r-shortcutAlfredo Sumaran2016-05-041-0/+4
* | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-1011-191/+200
|\ \
| * | Fix a few places where autoloading would failRémy Coutable2016-05-1011-190/+190
| * | Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-102-6/+15
* | | Merge branch 'issue_13987' into 'master' Stan Hu2016-05-103-3/+4
|\ \ \
| * | | Update CHANGELOGAlfredo Sumaran2016-05-101-0/+1
| * | | Update Ace EditorAlfredo Sumaran2016-05-102-3/+3
* | | | Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master' Robert Speicher2016-05-103-2/+140
|\ \ \ \ | |/ / / |/| | |
| * | | Fix an issue when filtering merge requests with more than one labelRémy Coutable2016-05-103-2/+140
* | | | Merge branch 'issue_15673' into 'master' Jacob Schatz2016-05-101-1/+1
|\ \ \ \
| * | | | Add to label :id to responseissue_15673Alfredo Sumaran2016-05-031-1/+1
* | | | | Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master' Robert Speicher2016-05-102-38/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Use abbrevation in runners table in admin areaGrzegorz Bizon2016-05-101-1/+1
| * | | | Remove broken inline runner description edit formGrzegorz Bizon2016-05-092-38/+2
* | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' Robert Speicher2016-05-103-1/+26
|\ \ \ \ \
| * | | | | Do not process upload links if no project contextGrzegorz Bizon2016-05-102-5/+9
| * | | | | Add Changelog entry for upload link in snippet fixGrzegorz Bizon2016-05-101-0/+1
| * | | | | Fix using link to uploads in global snippetsGrzegorz Bizon2016-05-102-1/+21
| |/ / / /
* | | | | Change dashboard button color to white on hoverDmitriy Zaporozhets2016-05-101-0/+4
* | | | | Minor consistency fixes to sidebar & headerDmitriy Zaporozhets2016-05-102-2/+2
* | | | | Merge branch 'mobile-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-108-9/+108
|\ \ \ \ \
| * | | | | Fix media queries for absolutely positioned nav elementAnnabel Dunstone2016-05-093-4/+14
| * | | | | Hide navbar on mobileAnnabel Dunstone2016-05-097-6/+95
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-10145-2734/+232
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '2460-3690-support-multiline-tag-message' into 'master' Rémy Coutable2016-05-109-142/+223
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Add integration specs for tagsRémy Coutable2016-05-108-137/+219
| | * | | | | Replace text field with textarea in 'New Tag' view and display tag message in...Calin Seciu2016-05-102-5/+4
| * | | | | | Merge branch 'revert-4026' into 'master' Rémy Coutable2016-05-105-7/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Revert "Merge branch 'wiki-fix' into 'master' "Rémy Coutable2016-05-105-7/+4
| * | | | | | Merge branch 'remove-annotate-gem' into 'master' Yorick Peterse2016-05-10131-2585/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove the annotate rake taskJeroen van Baarsen2016-05-101-44/+0
| | * | | | | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-09130-2541/+1
| * | | | | | Merge branch 'fix-link-to-redmine-issues' into 'master' Robert Speicher2016-05-102-0/+4
| |\ \ \ \ \ \
| | * | | | | | Links for redmine issue references are generated correctly againBenedikt Huss2016-05-102-0/+4
* | | | | | | | Merge branch 'xss-case-insensitive-protocol' into 'master' Robert Speicher2016-05-093-1/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use a case-insensitive comparison in sanitizing URI schemesStan Hu2016-05-093-1/+8
| |/ / / / / /
* | | | | | | Merge branch 'revert-450ea01d' into 'master' Achilleas Pipinellis2016-05-091-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert "Merge branch 'patch-1' into 'master'"Rémy Coutable2016-05-091-5/+5
| |/ / / / /
* | | | | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' Douwe Maan2016-05-093-2/+22
|\ \ \ \ \ \
| * | | | | | Fix adding a todo for private group membersAhmad Sherif2016-05-073-2/+22
* | | | | | | Merge branch 'cascade_drop' into 'master' Robert Speicher2016-05-091-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Add if exists to drop commandDrew Blessing2016-05-091-1/+3
* | | | | | | | Merge branch 'issue_15394' into 'master' Rémy Coutable2016-05-096-1/+26
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Make model sanitization methods one linersFelipe Artur2016-05-093-6/+5
| * | | | | | | Sanitize milestones and label titlesissue_15394Felipe Artur2016-05-055-1/+27
* | | | | | | | Merge branch '2954-api-expose-issue-user_notes_count' into 'master' Rémy Coutable2016-05-099-34/+89
|\ \ \ \ \ \ \ \