summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Expose shared groups for projectsapi-shared-groupsRobert Schilling2016-07-081-2/+38
* Merge branch 'issues-blank-state' into 'master' Jacob Schatz2016-07-072-1/+5
|\
| * Updated testsPhil Hughes2016-07-052-1/+5
* | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0728-70/+3235
|\ \
| * | Add comment with diff to DiffPositionUpdateService specnew-diff-notesDouwe Maan2016-07-071-0/+104
| * | Make `DiffNote#update_position` privateDouwe Maan2016-07-071-39/+44
| * | Update test with new factory nameDouwe Maan2016-07-071-2/+2
| * | Add send_git_patch helperDouwe Maan2016-07-061-1/+1
| * | Add tests for MergeRequest#reload_diffDouwe Maan2016-07-061-0/+40
| * | Add tests for DiffNoteDouwe Maan2016-07-061-0/+186
| * | Add tests for DiffPositionUpdateServiceDouwe Maan2016-07-061-0/+71
| * | Add tests for PositionDouwe Maan2016-07-061-0/+341
| * | Add tests for PositionTracerDouwe Maan2016-07-061-0/+1758
| * | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-062-6/+504
| * | Add DiffNote modelDouwe Maan2016-07-064-18/+43
| * | Add Gitlab::Diff::LineMapperDouwe Maan2016-07-061-0/+137
| * | Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-065-9/+8
| * | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-0611-34/+35
* | | Merge branch 'pending-delete-project-notifications' into 'master' Robert Speicher2016-07-072-0/+25
|\ \ \
| * | | Exclude projects pending delete from notificationsSean McGivern2016-07-072-0/+25
| |/ /
* | | Layout for Users Groups and Projects on admin areaAlfredo Sumaran2016-07-071-2/+2
* | | added testJames Lopez2016-07-071-0/+17
|/ /
* | Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz2016-07-061-1/+1
|\ \
| * | Remove plural from pipelines_spec18283-pluralize-stage-headingsAnnabel Dunstone2016-07-061-1/+1
* | | Merge branch 'gh-pull-requests' into 'master' Rémy Coutable2016-07-062-14/+23
|\ \ \
| * | | Consider that a GH exists only if both `ref`, and `sha` existDouglas Barbosa Alexandre2016-07-062-14/+23
| |/ /
* | | Merge branch 'remove-lowercase-gitlab-ci-yml' into 'master' Robert Speicher2016-07-061-3/+3
|\ \ \ | |/ / |/| |
| * | Fix specsRémy Coutable2016-07-061-3/+3
* | | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'm...Douwe Maan2016-07-061-1/+31
|\ \ \
| * | | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-061-4/+4
| * | | Fix diff comments not showing up in activity feedRémy Coutable2016-07-041-1/+31
* | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-065-39/+100
|\ \ \ \
| * | | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-051-6/+0
| * | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-052-0/+56
| * | | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-054-39/+50
| | |/ / | |/| |
* | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-061-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-3030-127/+551
| |\ \ \
| * \ \ \ fix merge conflictsJames Lopez2016-06-28109-1044/+2342
| |\ \ \ \
| * | | | | another fix and fixed specJames Lopez2016-06-221-1/+8
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-2241-566/+987
| |\ \ \ \ \
| * \ \ \ \ \ Merge branches 'fix/import-url-validator' and 'master' of gitlab.com:gitlab-o...James Lopez2016-06-2065-224/+7472
| |\ \ \ \ \ \
| * | | | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-171-0/+5
* | | | | | | | Revert back to not defining a default Git access protocol.Patricio Cano2016-07-051-1/+1
* | | | | | | | Default Git access protocol to `web`Patricio Cano2016-07-051-1/+1
* | | | | | | | Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-053-6/+6
* | | | | | | | Add more tests to the allowed protocols featurePatricio Cano2016-07-052-5/+103
* | | | | | | | Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ...Patricio Cano2016-07-052-2/+2
* | | | | | | | Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+66
* | | | | | | | Merge branch '18790-dont-show-request-button-to-project-owner' into 'master' Robert Speicher2016-07-055-69/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | New :request_access ability to replace a ugly helperRémy Coutable2016-07-055-69/+48