summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-127-12/+58
* revert front end changesZeger-Jan van de Weg2016-05-116-236/+147
* Incorporate feedbackZeger-Jan van de Weg2016-05-1115-97/+23
* Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1145-375/+743
|\
| * Merge branch 'no-todo-badge-on-zero' into 'master' Jacob Schatz2016-05-111-2/+3
| |\
| | * Don't show the Todo count if there aren't any Todos.Connor Shea2016-05-101-2/+3
| * | Merge branch 'hook-docs-behavior' into 'master' Robert Speicher2016-05-115-6/+21
| |\ \
| | * | Remove extra sanitizationJacob Vosmaer2016-05-101-1/+1
| | * | Fix test failuresJacob Vosmaer2016-05-092-3/+3
| | * | Remove spaceJacob Vosmaer2016-05-091-1/+1
| | * | Always mention HTTP statusJacob Vosmaer2016-05-031-1/+1
| | * | Inform user about questionable hook successJacob Vosmaer2016-05-031-2/+4
| | * | Improve documentation and web test for web hooksJacob Vosmaer2016-05-033-2/+15
| * | | Merge branch '17356-remove-monkey_patch' into 'master' Robert Speicher2016-05-111-48/+0
| |\ \ \
| | * | | Remove Rails monkey-patches now that we're using Rails 4.2.6Rémy Coutable2016-05-111-48/+0
| * | | | Merge branch 'improve-destroy-logging' into 'master' Robert Speicher2016-05-111-1/+1
| |\ \ \ \
| | * | | | Improve log message when a project is destroyed to include the namespaceStan Hu2016-05-101-1/+1
| * | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-116-15/+36
| |\ \ \ \ \
| | * | | | | Tidy up user project specsSean McGivern2016-05-112-14/+9
| | * | | | | Restrict starred projects to viewable onesSean McGivern2016-05-106-15/+41
| * | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into...Robert Speicher2016-05-117-55/+83
| |\ \ \ \ \ \
| | * | | | | | Only generate repository push email onceSean McGivern2016-05-117-55/+83
| * | | | | | | Merge branch 'update-changelog-874' into 'master' Yorick Peterse2016-05-111-3/+7
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Updated 8.7.4 CHANGELOG entriesYorick Peterse2016-05-111-3/+7
| * | | | | | | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-114-6/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Enable Rubocop Casecmp Performance Cop.Connor Shea2016-05-104-6/+5
| * | | | | | | | Merge branch 'string-replacement-cop' into 'master' Rémy Coutable2016-05-112-2/+3
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Enable the StringReplacement cop.Connor Shea2016-05-102-2/+3
| | |/ / / / / /
| * | | | | | | Merge branch 'jquery-scrollto' into 'master' Jacob Schatz2016-05-113-4/+210
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Removes jquery-scrollto-rails.Connor Shea2016-05-103-4/+210
| |/ / / / / /
| * | | | | | 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
| | |/ / / / / /
* | | | | | | | merge awards-handler.coffee from another branchZeger-Jan van de Weg2016-05-111-49/+48