summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets2015-08-1113-46/+290
|\
| * Fix file api testsDmitriy Zaporozhets2015-08-111-22/+8
| * Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-111-4/+48
| * Revert "Merge branch 'refactor-can-be-merge' into 'master'"Dmitriy Zaporozhets2015-08-111-14/+0
| * Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-1113-30/+258
* | Merge branch 'fix-diff-highlighting' into 'master'Douwe Maan2015-08-102-1/+17
|\ \
| * | Fix diff syntax highlightingStan Hu2015-08-102-1/+17
| |/
* | Merge branch 'disable-autocrlf-for-binary-files' into 'master'Stan Hu2015-08-101-0/+31
|\ \ | |/ |/|
| * Fix corrupted binary files when using API files endpointStan Hu2015-08-091-0/+31
* | Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-107-0/+64
|\ \ | |/ |/|
| * Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-087-0/+64
* | Merge branch 'merge-notifs' into 'master'Robert Speicher2015-08-071-1/+6
|\ \
| * \ Merge branch 'master' into merge-notifsmerge-notifsDouwe Maan2015-08-0633-601/+764
| |\ \
| * | | Send notification to all participants when MR is merged.Douwe Maan2015-07-301-1/+6
* | | | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-071-1/+3
|\ \ \ \
| * | | | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-1/+3
| | |_|/ | |/| |
* | | | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-076-9/+9
|/ / /
* | | Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-061-0/+22
|\ \ \
| * | | Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-061-0/+22
* | | | Merge branch 'report-spam'Dmitriy Zaporozhets2015-08-062-0/+16
|\ \ \ \
| * | | | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-062-0/+16
* | | | | Fix specDouwe Maan2015-08-061-2/+2
| |_|_|/ |/| | |
* | | | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-063-1/+19
|\ \ \ \
| * | | | Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-043-1/+19
* | | | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-062-0/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-021-0/+10
| * | | | Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-011-0/+20
* | | | | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0513-258/+30
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-051-5/+0
| * | | | Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-044-13/+13
| * | | | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0446-809/+1251
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Fix merge api and specDmitriy Zaporozhets2015-08-041-14/+12
| * | | | Fix some of testsDmitriy Zaporozhets2015-07-163-4/+4
| * | | | Remove satellitesDmitriy Zaporozhets2015-07-154-222/+1
* | | | | Merge branch 'revert_touch' into 'master' Sytse Sijbrandij2015-08-052-5/+1
|\ \ \ \ \
| * | | | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-052-5/+1
| | |/ / / | |/| | |
* | | | | Add "Confirm user" button in user admin pageStan Hu2015-08-052-0/+27
|/ / / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-0312-324/+615
|\ \ \ \
| * \ \ \ Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-024-3/+9
| |\ \ \ \
| | * | | | Re-annotate modelsAtsushi Ishida2015-08-034-3/+9
| | | |/ / | | |/| |
| * | | | Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-311-0/+171
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into api-useremailsDouwe Maan2015-07-317-321/+417
| | |\ \ \
| | * | | | Fix docsDouwe Maan2015-07-301-1/+1
| | * | | | Add ability to manage user email addresses via the API.Douwe Maan2015-07-291-0/+171
| * | | | | Fix multi-line syntax highlightingStan Hu2015-07-301-0/+18
| | |/ / / | |/| | |
| * | | | Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher2015-07-311-0/+16
| |\ \ \ \
| | * | | | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-0/+16
| | | |_|/ | | |/| |
| * | | | Merge branch 'rs-markdown-feature-pipelines' into 'master' Robert Speicher2015-07-314-314/+388
| |\ \ \ \
| | * | | | Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelinesRobert Speicher2015-07-292-24/+9
| | * | | | Update Markdown feature to allow for multiple pipelinesRobert Speicher2015-07-282-163/+209