summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-061-0/+1
|\
| * Enforce the fork_project permission in Projects::CreateServiceNick Thomas2016-09-271-0/+1
* | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-043-66/+1
|\ \
| * \ Merge branch 'fix/import-export-admin' into 'master' Robert Speicher2016-10-031-0/+1
| |\ \
| | * | Enable import/export back for non-adminsfix/import-export-adminJames Lopez2016-10-031-0/+1
| * | | Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-featuresRobert Speicher2016-10-032-66/+0
| |/ /
* | | Merge branch 'master' into revert-c676283bPhil Hughes2016-10-036-6/+11
|\ \ \ | |/ /
| * | Add organization field to user profileDmitriy Zaporozhets2016-09-271-0/+2
| * | Merge branch 'full-width-new-snippet-button' into 'master' Fatih Acet2016-09-262-3/+3
| |\ \ | | |/ | |/|
| | * Added full-width new snippet button on mobile and corrected capitalizationfull-width-new-snippet-buttonLuke Bennett2016-09-182-3/+3
| * | fix issues mr counterbarthc2016-09-202-2/+2
| |/
| * Merge branch 'pipeline-hooks' into 'master' Rémy Coutable2016-09-081-0/+1
| |\
| | * Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-09-064-29/+23
| | |\
| | * \ Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-264-6/+5
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooksLin Jen-Shin2016-08-2424-54/+84
| | |\ \ \
| | * \ \ \ Merge branch 'master' into pipeline-hooksLin Jen-Shin2016-08-022-2/+2
| | |\ \ \ \
| | * | | | | Fix test for checking everything for Slack serviceLin Jen-Shin2016-07-301-0/+1
| * | | | | | Fix issuable_bulk_update_path and merge request spinach testDmitriy Zaporozhets2016-09-081-1/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-09-024-29/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '21508-inconsistency-personal-dashboard-todos-page-uses-old-inte...Fatih Acet2016-09-012-26/+17
| |\ \ \ \ \
| | * | | | | Added todo filter tests21508-inconsistency-personal-dashboard-todos-page-uses-old-interface-wrong-dropdown-filter-buttonsLuke Bennett2016-09-011-20/+0
| | * | | | | Removed select2 from todos feature specLuke Bennett2016-09-011-6/+17
| * | | | | | Project tools visibility levelFelipe Artur2016-09-012-3/+5
| |/ / / / /
| * | | | | Fix bug where pagination is still displayed despite all todos marked as doneClement Ho2016-08-311-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into revert-c676283bPhil Hughes2016-08-3027-77/+121
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'capitalize-mentioned-issue-notes' into 'master' Douwe Maan2016-08-261-1/+1
| |\ \ \ \
| | * | | | Capitalize mentioned issue timeline notesClement Ho2016-08-251-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-251-1/+0
| |\ \ \ \
| | * | | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-251-1/+0
| | |/ / /
| * | | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-252-4/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-223-8/+8
| | |\ \ \
| | * \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-195-8/+8
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1518-40/+64
| | |\ \ \ \ \
| | * | | | | | Chnage the way how merge request diff is initialized and savedDmitriy Zaporozhets2016-08-022-4/+4
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix Spinach branches specfix-spinach-branches-specSean McGivern2016-08-232-0/+6
| * | | | | | Revert the revert of Optimistic Lockingrevert_revert_issuable_lockValery Sizov2016-08-221-1/+1
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'expiration-date-on-memberships' into 'master' Douwe Maan2016-08-192-4/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-182-2/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Add expiration date to group membershipsSean McGivern2016-08-182-2/+2
| | * | | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1819-44/+68
| | |\ \ \ \ \
| | * | | | | | Allow to edit access expiration date.Adam Niedzielski2016-08-052-2/+2
| * | | | | | | Don't use global variables.ace-venturaConnor Shea2016-08-181-4/+4
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '18334-truncate-award-emoji-users' into 'master' Jacob Schatz2016-08-181-1/+1
| |\ \ \ \ \ \
| | * | | | | | Award tooltips refer to current user as "You"Jack Davison2016-08-171-1/+1
| * | | | | | | Fix broken feature spec.fix-issue-filter-specRuben Davila2016-08-171-1/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | Now waits for All issuables to load when clickedremove-sleep-calls-from-phantom-update-spinach-specsLuke Bennett2016-08-172-0/+4
| * | | | | | Removed sleep calls introduced in !5740Luke Bennett2016-08-172-3/+0
| |/ / / / /
| * | | | | Merge branch 'fix/import-permissions' into 'master' Douwe Maan2016-08-152-3/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix permissions check in controller, added relevant spec and updated docsJames Lopez2016-08-112-3/+2
| * | | | | Remove sleeping and replace escaped text.Connor Shea2016-08-131-6/+6