summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sidekiq MemoryKiller sends a `SIGKILL` signal, not `SIGTERM`fix-operations-docRémy Coutable2016-04-261-1/+1
* Merge branch '15094-throttle-update-of-last_activity_at' into 'master' Jacob Vosmaer2016-04-263-23/+45
|\
| * Throttle the update of `project.last_activity_at` to 1 minute15094-throttle-update-of-last_activity_atRémy Coutable2016-04-253-23/+45
* | Merge branch 'upgrade-gitlab-grit' into 'master' Robert Speicher2016-04-251-3/+3
|\ \
| * | Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version depe...Connor Shea2016-04-241-3/+3
* | | Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master' Robert Speicher2016-04-251-1/+6
|\ \ \
| * | | link user avatar in activity page to user profilelink_user_avatar_in_activity_page_to_profileArinde Eniola2016-04-251-1/+6
* | | | Merge branch 'fix-changelog' into 'master' Jacob Schatz2016-04-251-1/+1
|\ \ \ \
| * | | | Move CHANGELOG entry to 8.8Alfredo Sumaran2016-04-251-1/+1
* | | | | Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-253-17/+8
|\ \ \ \ \
| * | | | | Removed usage of normilizeEmojiName methodemoji-unicode-fixPhil Hughes2016-04-222-7/+1
| * | | | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-223-13/+10
* | | | | | Merge branch 'diff-line-colors' into 'master' Jacob Schatz2016-04-253-8/+16
|\ \ \ \ \ \
| * | | | | | Update diff blue & yellow to match designdiff-line-colorsAnnabel Dunstone2016-04-223-8/+16
| |/ / / / /
* | | | | | Merge branch 'fix/ci-docker-images-documentation' into 'master' Achilleas Pipinellis2016-04-251-2/+2
|\ \ \ \ \ \
| * | | | | | Replace '-n' with '--name' in docker related documentationfix/ci-docker-images-documentationTomasz Maczukin2016-04-251-2/+2
* | | | | | | Merge branch 'fix/ci-php-docker-example' into 'master' Achilleas Pipinellis2016-04-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix php-docker example (for new docker versions)fix/ci-php-docker-exampleTomasz Maczukin2016-04-251-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'blur-award-btn' into 'master' Jacob Schatz2016-04-251-0/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Triggers blur after clicking award buttonblur-award-btnPhil Hughes2016-04-221-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-2511-50/+118
|\ \ \ \ \ \
| * | | | | | Add Rspec test for "i" shortcutissue_14904Alfredo Sumaran2016-04-211-0/+21
| * | | | | | Remove spinach featuresAlfredo Sumaran2016-04-213-13/+0
| * | | | | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2199-3074/+1000
| |\ \ \ \ \ \
| * | | | | | | Use gon.shortcuts_path directlyAlfredo Sumaran2016-04-211-2/+1
| * | | | | | | Move event handlers to methodsAlfredo Sumaran2016-04-211-10/+14
| * | | | | | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2058-191/+3448
| |\ \ \ \ \ \ \
| * | | | | | | | Make shortcuts work when sidebar is collapsedAlfredo Sumaran2016-04-203-35/+54
| * | | | | | | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-20182-568/+2797
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add shortcut_path to GonHelper moduleAlfredo Sumaran2016-04-181-0/+1
| * | | | | | | | | Expose shortcuts url from the backend via gonAlfredo Sumaran2016-04-181-2/+1
| * | | | | | | | | Use proper methodAlfredo Sumaran2016-04-181-1/+1
| * | | | | | | | | Fix specsAlfredo Sumaran2016-04-181-1/+1
| * | | | | | | | | Remove @focusAlfredo Sumaran2016-04-181-1/+1
| * | | | | | | | | Add tests for the "i" shortcutAlfredo Sumaran2016-04-183-0/+13
| * | | | | | | | | Update shortcuts imageAlfredo Sumaran2016-04-181-0/+0
| * | | | | | | | | Update shortcuts dialogAlfredo Sumaran2016-04-181-1/+13
| * | | | | | | | | Update CHANGELOGAlfredo Sumaran2016-04-181-0/+1
| * | | | | | | | | Set `i` as a shortcut for creating a new issueAlfredo Sumaran2016-04-182-0/+6
| * | | | | | | | | Toggle help modalAlfredo Sumaran2016-04-181-20/+23
| * | | | | | | | | Set "l" for Label shortcutAlfredo Sumaran2016-04-181-1/+4
* | | | | | | | | | Merge branch 'project-dropdown-link-click-fix' into 'master' Jacob Schatz2016-04-251-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed issue with project dropdown links not being clickableproject-dropdown-link-click-fixPhil Hughes2016-04-221-2/+2
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'word-break' into 'master' Jacob Schatz2016-04-253-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't break line in middle of wordword-breakAnnabel Dunstone2016-04-213-1/+6
* | | | | | | | | | | Merge branch 'fix/error-on-builds-page' into 'master' Robert Speicher2016-04-253-1/+29
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add Changelog entry for commit builds page fixGrzegorz Bizon2016-04-251-0/+1
| * | | | | | | | | | | Fix error on commit builds page when no builds yetGrzegorz Bizon2016-04-252-1/+28
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-503-page' into 'master' Dmitriy Zaporozhets2016-04-253-2/+58
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add a branded 503 static error pagers-503-pageRobert Speicher2016-04-223-2/+58