Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix tests and wrong choices during merge | Zeger-Jan van de Weg | 2016-05-12 | 7 | -12/+58 |
* | revert front end changes | Zeger-Jan van de Weg | 2016-05-11 | 6 | -236/+147 |
* | Incorporate feedback | Zeger-Jan van de Weg | 2016-05-11 | 15 | -97/+23 |
* | Merge branch 'master' into awardables | Zeger-Jan van de Weg | 2016-05-11 | 45 | -375/+743 |
|\ | |||||
| * | Merge branch 'no-todo-badge-on-zero' into 'master' | Jacob Schatz | 2016-05-11 | 1 | -2/+3 |
| |\ | |||||
| | * | Don't show the Todo count if there aren't any Todos. | Connor Shea | 2016-05-10 | 1 | -2/+3 |
| * | | Merge branch 'hook-docs-behavior' into 'master' | Robert Speicher | 2016-05-11 | 5 | -6/+21 |
| |\ \ | |||||
| | * | | Remove extra sanitization | Jacob Vosmaer | 2016-05-10 | 1 | -1/+1 |
| | * | | Fix test failures | Jacob Vosmaer | 2016-05-09 | 2 | -3/+3 |
| | * | | Remove space | Jacob Vosmaer | 2016-05-09 | 1 | -1/+1 |
| | * | | Always mention HTTP status | Jacob Vosmaer | 2016-05-03 | 1 | -1/+1 |
| | * | | Inform user about questionable hook success | Jacob Vosmaer | 2016-05-03 | 1 | -2/+4 |
| | * | | Improve documentation and web test for web hooks | Jacob Vosmaer | 2016-05-03 | 3 | -2/+15 |
| * | | | Merge branch '17356-remove-monkey_patch' into 'master' | Robert Speicher | 2016-05-11 | 1 | -48/+0 |
| |\ \ \ | |||||
| | * | | | Remove Rails monkey-patches now that we're using Rails 4.2.6 | Rémy Coutable | 2016-05-11 | 1 | -48/+0 |
| * | | | | Merge branch 'improve-destroy-logging' into 'master' | Robert Speicher | 2016-05-11 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Improve log message when a project is destroyed to include the namespace | Stan Hu | 2016-05-10 | 1 | -1/+1 |
| * | | | | | Merge branch '17249-starred' into 'master' | Robert Speicher | 2016-05-11 | 6 | -15/+36 |
| |\ \ \ \ \ | |||||
| | * | | | | | Tidy up user project specs | Sean McGivern | 2016-05-11 | 2 | -14/+9 |
| | * | | | | | Restrict starred projects to viewable ones | Sean McGivern | 2016-05-10 | 6 | -15/+41 |
| * | | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into... | Robert Speicher | 2016-05-11 | 7 | -55/+83 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Only generate repository push email once | Sean McGivern | 2016-05-11 | 7 | -55/+83 |
| * | | | | | | | Merge branch 'update-changelog-874' into 'master' | Yorick Peterse | 2016-05-11 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | Updated 8.7.4 CHANGELOG entries | Yorick Peterse | 2016-05-11 | 1 | -3/+7 |
| * | | | | | | | Merge branch 'casecmp-cop' into 'master' | Rémy Coutable | 2016-05-11 | 4 | -6/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Enable Rubocop Casecmp Performance Cop. | Connor Shea | 2016-05-10 | 4 | -6/+5 |
| * | | | | | | | | Merge branch 'string-replacement-cop' into 'master' | Rémy Coutable | 2016-05-11 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Enable the StringReplacement cop. | Connor Shea | 2016-05-10 | 2 | -2/+3 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'jquery-scrollto' into 'master' | Jacob Schatz | 2016-05-11 | 3 | -4/+210 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Removes jquery-scrollto-rails. | Connor Shea | 2016-05-10 | 3 | -4/+210 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'fix-r-shortcut' into 'master' | Jacob Schatz | 2016-05-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Restore "r" shortcutfix-r-shortcut | Alfredo Sumaran | 2016-05-04 | 1 | -0/+4 |
| * | | | | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' | Robert Speicher | 2016-05-10 | 11 | -191/+200 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix a few places where autoloading would fail | Rémy Coutable | 2016-05-10 | 11 | -190/+190 |
| | * | | | | | | | Add eager load paths to help prevent dependency load issues with Sidekiq workers | Stan Hu | 2016-05-10 | 2 | -6/+15 |
| * | | | | | | | | Merge branch 'issue_13987' into 'master' | Stan Hu | 2016-05-10 | 3 | -3/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Update CHANGELOG | Alfredo Sumaran | 2016-05-10 | 1 | -0/+1 |
| | * | | | | | | | | Update Ace Editor | Alfredo Sumaran | 2016-05-10 | 2 | -3/+3 |
| * | | | | | | | | | Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master' | Robert Speicher | 2016-05-10 | 3 | -2/+140 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix an issue when filtering merge requests with more than one label | Rémy Coutable | 2016-05-10 | 3 | -2/+140 |
| * | | | | | | | | | Merge branch 'issue_15673' into 'master' | Jacob Schatz | 2016-05-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Add to label :id to responseissue_15673 | Alfredo Sumaran | 2016-05-03 | 1 | -1/+1 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master' | Robert Speicher | 2016-05-10 | 2 | -38/+2 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Use abbrevation in runners table in admin area | Grzegorz Bizon | 2016-05-10 | 1 | -1/+1 |
| | * | | | | | | | Remove broken inline runner description edit form | Grzegorz Bizon | 2016-05-09 | 2 | -38/+2 |
| * | | | | | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' | Robert Speicher | 2016-05-10 | 3 | -1/+26 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Do not process upload links if no project context | Grzegorz Bizon | 2016-05-10 | 2 | -5/+9 |
| | * | | | | | | | Add Changelog entry for upload link in snippet fix | Grzegorz Bizon | 2016-05-10 | 1 | -0/+1 |
| | * | | | | | | | Fix using link to uploads in global snippets | Grzegorz Bizon | 2016-05-10 | 2 | -1/+21 |
| | |/ / / / / / | |||||
* | | | | | | | | merge awards-handler.coffee from another branch | Zeger-Jan van de Weg | 2016-05-11 | 1 | -49/+48 |