summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Restore unicode-file-name images for legacy img emojisfix-legacy-emojis-using-unicode-file-nameEric Eastwood2017-03-161-0/+2
* Merge branch 'dm-copy-code-as-gfm' into 'master' Sean McGivern2017-03-1512-368/+559
|\
| * Remove selectionToGFMdm-copy-code-as-gfmDouwe Maan2017-03-142-9/+7
| * Fix specsDouwe Maan2017-03-147-24/+24
| * Document tag option and clarify specDouwe Maan2017-03-142-5/+4
| * Copy code as GFM from diffs, blobs and GFM code blocksDouwe Maan2017-03-146-343/+537
* | Merge branch 'filter-search-scrollbar' into 'master' Clement Ho2017-03-151-1/+1
|\ \
| * | don't show scrollbar on search field unless necessaryfilter-search-scrollbarSimon Knox2017-03-111-1/+1
* | | Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master' Douwe Maan2017-03-155-3/+31
|\ \ \
| * | | Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhookRuben Davila2017-03-145-3/+31
* | | | Merge branch 'issue_29449' into 'master' Rémy Coutable2017-03-152-5/+6
|\ \ \ \
| * | | | Remove whitespace in group linksXurxo2017-03-152-5/+6
|/ / / /
* | | | Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master' Robert Speicher2017-03-153-35/+66
|\ \ \ \
| * | | | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8Sean McGivern2017-03-153-35/+66
* | | | | Merge branch 'docs/nested-groups' into 'master' Achilleas Pipinellis2017-03-157-0/+166
|\ \ \ \ \
| * | | | | Change naming from nested groups to subgroupsdocs/nested-groupsAchilleas Pipinellis2017-03-151-1/+1
| * | | | | Address subgroups docs reviewAchilleas Pipinellis2017-03-141-47/+39
| * | | | | Fix wordingAchilleas Pipinellis2017-03-141-2/+2
| * | | | | Add info on group membershipAchilleas Pipinellis2017-03-141-10/+29
| * | | | | Add nested groups documentationAchilleas Pipinellis2017-03-147-0/+155
* | | | | | Merge branch '28277-document-u2f-limitations-with-multiple-urls' into 'master' Achilleas Pipinellis2017-03-152-0/+15
|\ \ \ \ \ \
| * | | | | | Document U2F limitations with multiple hostnames/FQDNs.28277-document-u2f-limitations-with-multiple-urlsTimothy Andrew2017-02-252-0/+15
* | | | | | | Merge branch 'issue-boards-docs' into 'master' Achilleas Pipinellis2017-03-151-2/+9
|\ \ \ \ \ \ \
| * | | | | | | Added issue boards re-ordering docsPhil Hughes2017-03-151-2/+9
* | | | | | | | Merge branch 'fix-milestone-name-on-show' into 'master' Rémy Coutable2017-03-153-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Switch to using milestone.to_reference when displaying milestone Fix #29214Raveesh2017-03-143-2/+6
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-polling-doc' into 'master' Sean McGivern2017-03-151-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match`fix-polling-docRémy Coutable2017-03-151-3/+3
* | | | | | | | | Merge branch '27551-use-dev-mirror-of-gitlab-git-test-on-dev' into 'master' Sean McGivern2017-03-152-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow to override GITLAB_GIT_TEST_REPO_URL to specify a different gitlab-git-...27551-use-dev-mirror-of-gitlab-git-test-on-devRémy Coutable2017-03-142-4/+4
* | | | | | | | | | Merge branch 'rs-dropdown-author-spec-speed' into 'master' Rémy Coutable2017-03-151-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Speed up the issues/filtered_search/dropdown_author feature specrs-dropdown-author-spec-speedRobert Speicher2017-03-141-2/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'test-db-rollback' into 'master' Kamil Trzciński2017-03-1511-9/+28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Split to two commands, feedback:test-db-rollbackLin Jen-Shin2017-03-141-1/+2
| * | | | | | | | | | Use `remove_foreign_key :timelogs, name: '...'`Lin Jen-Shin2017-03-141-9/+2
| * | | | | | | | | | Drop the index only for postgresql, becauseLin Jen-Shin2017-03-141-1/+2
| * | | | | | | | | | Disable rubocop for down methodLin Jen-Shin2017-03-141-0/+1
| * | | | | | | | | | Fix for postgresqlLin Jen-Shin2017-03-144-4/+12
| * | | | | | | | | | Add a test which would rollback db and migrate againLin Jen-Shin2017-03-149-7/+26
* | | | | | | | | | | Merge branch '29469-message-for-project-x-will-be-deleted-should-include-name...Rémy Coutable2017-03-153-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Display full project name with namespace upon deletionMark Fletcher2017-03-153-3/+7
* | | | | | | | | | | Merge branch 'fix-migration-rc1-rollback' into 'master' Stan Hu2017-03-152-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixing two migrations that could not be rolled backfix-migration-rc1-rollbackDJ Mountney2017-03-142-2/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '29414-fix-toggle-disccusion-link-jump-pick-into-9-0' into 'mast...Alfredo Sumaran2017-03-151-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix link togglers jumping to top29414-fix-toggle-disccusion-link-jump-pick-into-9-0Eric Eastwood2017-03-141-1/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' Alfredo Sumaran2017-03-157-6/+122
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Toggle project name if too long28187-project-name-cut-off-with-nested-groupsSam Rose2017-03-137-6/+122
* | | | | | | | | | Merge branch 'preserve_order_issue_board' into 'master' Douwe Maan2017-03-144-1/+49
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Preserve order by priority on issues boardpreserve_order_issue_boardValery Sizov2017-03-144-1/+49
* | | | | | | | | | | Merge branch 'sh-expand-on-definition-of-done' into 'master' Stan Hu2017-03-142-0/+49
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status