Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert the AddNotifiedOfOwnActivityToUsers migrationrs-revert-notified-of-own-activity-migration | Robert Speicher | 2017-03-15 | 2 | -1/+25 |
* | Merge branch '8836-mr-revert' into 'master' | Robert Speicher | 2017-03-15 | 10 | -168/+6 |
|\ | |||||
| * | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' | Stan Hu | 2017-03-15 | 10 | -168/+6 |
* | | Merge branch 'docs/add-missing-steps-in-pages-source-install' into 'master' | Robert Speicher | 2017-03-15 | 1 | -20/+62 |
|\ \ | |||||
| * | | Bump pages daemon to 0.4.0docs/add-missing-steps-in-pages-source-install | Achilleas Pipinellis | 2017-03-14 | 1 | -5/+5 |
| * | | Add missing steps of Pages source installation | Achilleas Pipinellis | 2017-03-14 | 1 | -20/+62 |
* | | | Merge branch 'add_quick_submit_for_snippet_forms' into 'master' | Clement Ho | 2017-03-15 | 2 | -1/+5 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add quick submit for snippet forms | blackst0ne | 2017-03-14 | 2 | -1/+5 |
* | | | Merge branch 'better-priority-sorting' into 'master' | Douwe Maan | 2017-03-15 | 25 | -27/+213 |
|\ \ \ | |||||
| * | | | Allow filtering by all started milestonesbetter-priority-sorting | Sean McGivern | 2017-03-15 | 15 | -12/+107 |
| * | | | Allow sorting by due date and label priority | Sean McGivern | 2017-03-15 | 10 | -15/+106 |
* | | | | Merge branch 'revert-e52529e2' into 'master' | Sean McGivern | 2017-03-15 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Revert "Merge branch 'google-protobuf-3.2.0.1' into 'master'" | Rémy Coutable | 2017-03-15 | 1 | -1/+1 |
* | | | | | Merge branch '27174-filter-filters' into 'master' | Clement Ho | 2017-03-15 | 5 | -16/+53 |
|\ \ \ \ \ | |||||
| * | | | | | prevent filtering Issues by multiple milestones, authors, or assignees27174-filter-filters | Simon Knox | 2017-03-11 | 5 | -16/+53 |
* | | | | | | Merge branch 'dm-copy-code-as-gfm' into 'master' | Sean McGivern | 2017-03-15 | 12 | -368/+559 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove selectionToGFMdm-copy-code-as-gfm | Douwe Maan | 2017-03-14 | 2 | -9/+7 |
| * | | | | | | Fix specs | Douwe Maan | 2017-03-14 | 7 | -24/+24 |
| * | | | | | | Document tag option and clarify spec | Douwe Maan | 2017-03-14 | 2 | -5/+4 |
| * | | | | | | Copy code as GFM from diffs, blobs and GFM code blocks | Douwe Maan | 2017-03-14 | 6 | -343/+537 |
* | | | | | | | Merge branch 'filter-search-scrollbar' into 'master' | Clement Ho | 2017-03-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | don't show scrollbar on search field unless necessaryfilter-search-scrollbar | Simon Knox | 2017-03-11 | 1 | -1/+1 |
* | | | | | | | Merge branch '27271-missing-time-spent-in-issue-webhook' into 'master' | Douwe Maan | 2017-03-15 | 5 | -3/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Include time tracking attributes in webhooks payload27271-missing-time-spent-in-issue-webhook | Ruben Davila | 2017-03-14 | 5 | -3/+31 |
* | | | | | | | | Merge branch 'issue_29449' into 'master' | Rémy Coutable | 2017-03-15 | 2 | -5/+6 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove whitespace in group links | Xurxo | 2017-03-15 | 2 | -5/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'allow-resolving-conflicts-in-utf-8' into 'master' | Robert Speicher | 2017-03-15 | 3 | -35/+66 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Allow resolving conflicts with non-ASCII charsallow-resolving-conflicts-in-utf-8 | Sean McGivern | 2017-03-15 | 3 | -35/+66 |
* | | | | | | | | Merge branch 'docs/nested-groups' into 'master' | Achilleas Pipinellis | 2017-03-15 | 7 | -0/+166 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Change naming from nested groups to subgroupsdocs/nested-groups | Achilleas Pipinellis | 2017-03-15 | 1 | -1/+1 |
| * | | | | | | | | Address subgroups docs review | Achilleas Pipinellis | 2017-03-14 | 1 | -47/+39 |
| * | | | | | | | | Fix wording | Achilleas Pipinellis | 2017-03-14 | 1 | -2/+2 |
| * | | | | | | | | Add info on group membership | Achilleas Pipinellis | 2017-03-14 | 1 | -10/+29 |
| * | | | | | | | | Add nested groups documentation | Achilleas Pipinellis | 2017-03-14 | 7 | -0/+155 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch '28277-document-u2f-limitations-with-multiple-urls' into 'master' | Achilleas Pipinellis | 2017-03-15 | 2 | -0/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Document U2F limitations with multiple hostnames/FQDNs.28277-document-u2f-limitations-with-multiple-urls | Timothy Andrew | 2017-02-25 | 2 | -0/+15 |
* | | | | | | | | | Merge branch 'issue-boards-docs' into 'master' | Achilleas Pipinellis | 2017-03-15 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added issue boards re-ordering docs | Phil Hughes | 2017-03-15 | 1 | -2/+9 |
* | | | | | | | | | | Merge branch 'fix-milestone-name-on-show' into 'master' | Rémy Coutable | 2017-03-15 | 3 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Switch to using milestone.to_reference when displaying milestone Fix #29214 | Raveesh | 2017-03-14 | 3 | -2/+6 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-polling-doc' into 'master' | Sean McGivern | 2017-03-15 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix typo in doc/development/polling.md: `If-None-Modified` -> `If-None-Match`fix-polling-doc | Rémy Coutable | 2017-03-15 | 1 | -3/+3 |
* | | | | | | | | | | | Merge branch '27551-use-dev-mirror-of-gitlab-git-test-on-dev' into 'master' | Sean McGivern | 2017-03-15 | 2 | -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-dev | Rémy Coutable | 2017-03-14 | 2 | -4/+4 |
* | | | | | | | | | | | | Merge branch 'rs-dropdown-author-spec-speed' into 'master' | Rémy Coutable | 2017-03-15 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Speed up the issues/filtered_search/dropdown_author feature specrs-dropdown-author-spec-speed | Robert Speicher | 2017-03-14 | 1 | -2/+3 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'test-db-rollback' into 'master' | Kamil Trzciński | 2017-03-15 | 11 | -9/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Split to two commands, feedback:test-db-rollback | Lin Jen-Shin | 2017-03-14 | 1 | -1/+2 |
| * | | | | | | | | | | | | Use `remove_foreign_key :timelogs, name: '...'` | Lin Jen-Shin | 2017-03-14 | 1 | -9/+2 |
| * | | | | | | | | | | | | Drop the index only for postgresql, because | Lin Jen-Shin | 2017-03-14 | 1 | -1/+2 |