summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Cleans up the build trace and speedup static testsclean-build-log-static-analyticsZeger-Jan van de Weg2016-04-151-2/+11
* Merge branch 'new-mr-improvements' into 'master' Rémy Coutable2016-04-156-26/+31
|\
| * Indented codePhil Hughes2016-04-151-8/+8
| * Updated MR comparenew-mr-improvementsPhil Hughes2016-04-136-26/+31
* | Add 8.6.6 CHANGELOG entriesRémy Coutable2016-04-151-9/+10
* | Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' Robert Speicher2016-04-153-14/+4
|\ \
| * | Remove Gitlab::Shell#update_repository_head since it's not used anymorepmq20/gitlab-ce-psvr/change-headRémy Coutable2016-04-151-13/+0
| * | Use rugged to change HEADP.S.V.R2016-04-132-1/+4
* | | Merge branch 'assign-to-issuable-opener' into 'master' Jacob Schatz2016-04-157-13/+46
|\ \ \
| * \ \ Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-1544-326/+507
| |\ \ \
| * | | | Add author id to the right selectorZeger-Jan van de Weg2016-04-051-1/+2
| * | | | Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-04-05241-1231/+12171
| |\ \ \ \
| * | | | | Target right releaseZeger-Jan van de Weg2016-03-291-1/+1
| * | | | | Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-03-291078-10074/+26796
| |\ \ \ \ \
| * | | | | | Revert authors ability to assign anyoneZeger-Jan van de Weg2016-02-228-35/+11
| * | | | | | Fix loading data when no author_id is passedZeger-Jan van de Weg2016-02-222-3/+3
| * | | | | | Issuable can be assigned to authorZeger-Jan van de Weg2016-02-2212-20/+71
* | | | | | | Merge branch 'rugged-delete-tag' into 'master' Rémy Coutable2016-04-155-28/+10
|\ \ \ \ \ \ \
| * | | | | | | Delete tags via ruggedRobert Schilling2016-04-155-28/+10
* | | | | | | | Merge branch 'remove-backend-code' into 'master' Rémy Coutable2016-04-151-27/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove unused backend methodsRobert Schilling2016-04-151-27/+0
|/ / / / / / /
* | | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqJacob Vosmaer2016-04-151-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Fix required gitlab-shell version.Rémy Coutable2016-04-151-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | fix required gitlab-shell version.lurdan2016-04-151-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' Rémy Coutable2016-04-154-2/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Make /profile/keys/new redirects to /profile/keys for back-compatRémy Coutable2016-04-154-2/+18
* | | | | | | | | Merge branch 'i_14431_award_emoji_count_not_in_comment_count' into 'master' Rémy Coutable2016-04-156-5/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not include award emojis in issue view comment_counttheoretick2016-04-146-5/+43
* | | | | | | | | | Merge branch 'rs-trailing-slash-in-search' into 'master' Douwe Maan2016-04-152-1/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Escape the query argument provided to `git grep` by `search_files`rs-trailing-slash-in-searchRobert Speicher2016-04-092-1/+7
* | | | | | | | | | | Merge branch 'fix-migrate_new_notification_setting' into 'master' Robert Speicher2016-04-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix datetime format when migrating new notification settings on MySQLDouglas Barbosa Alexandre2016-04-141-1/+1
* | | | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-04-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | change: "very demand" changed to "specific demand" Jamie Neubert Pedersen2016-04-141-1/+1
* | | | | | | | | | | | | Merge branch '14176-diff-paste-data' into 'master' Jacob Schatz2016-04-147-31/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Syntax & style updates14176-diff-paste-dataAnnabel Dunstone2016-04-145-29/+31
| * | | | | | | | | | | | Update click_diff_lineAnnabel Dunstone2016-04-141-1/+1
| * | | | | | | | | | | | Add line type conditional to diff line helperAnnabel Dunstone2016-04-144-11/+17
| * | | | | | | | | | | | Add content attributes to discussion diffs; change styling of add-note icon t...Annabel Dunstone2016-04-144-22/+24
| * | | | | | | | | | | | Copying and pasting doesn't grab line numbers or +/-Annabel Dunstone2016-04-144-6/+27
* | | | | | | | | | | | | Merge branch 'rs-sentry-contexts' into 'master' Stan Hu2016-04-141-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add Sentry program context even without a current userRobert Speicher2016-04-141-8/+10
* | | | | | | | | | | | | | Merge branch 'remove-ci-nginx-config' into 'master' Robert Speicher2016-04-141-29/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove deprecated NGINX CI configAchilleas Pipinellis2016-04-141-29/+0
* | | | | | | | | | | | | | | Merge branch 'emoji_category_fix' into 'master' Robert Speicher2016-04-143-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Emoji categories fixValery Sizov2016-04-143-3/+21
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'subscribe-button-fix' into 'master' Jacob Schatz2016-04-148-16/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed style issuessubscribe-button-fixPhil Hughes2016-04-141-1/+1
| * | | | | | | | | | | | | Fixed haml style issuesPhil Hughes2016-04-141-1/+1
| * | | | | | | | | | | | | Fixed issue with failing testsPhil Hughes2016-04-123-3/+3