summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-2/+4
|\
| * Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-031-2/+4
* | Move admin deploy keys spinach to rspecSemyon Pupkov2017-01-032-82/+0
|/
* Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-272-0/+82
|\
| * Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2020-786/+13
| |\
| * \ Merge CSSFilipa Lacerda2016-12-127-47/+13
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0616-135/+33
| |\ \ \
| * | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-222-2/+22
* | | | | Changes after reviewFilipa Lacerda2016-12-212-11/+0
| |_|_|/ |/| | |
* | | | Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-202-151/+0
|\ \ \ \
| * | | | Move admin projects spinach tests to rspecSemyon Pupkov2016-12-192-151/+0
* | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-202-8/+8
|\ \ \ \ \
| * | | | | Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-192-6/+6
| * | | | | Improve after feedbackKamil Trzcinski2016-12-192-7/+7
* | | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' Rémy Coutable2016-12-193-113/+0
|\ \ \ \ \ \
| * | | | | | Move Admin Appearance spinach feature to rspecjurre2016-12-193-113/+0
* | | | | | | Move admin broadcast messages spinach feature to rspecjurre2016-12-192-99/+0
|/ / / / / /
* | | | | | Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-192-155/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move admin labels spinach test to rspecSemyon Pupkov2016-12-192-155/+0
| |/ / / /
* | | | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-193-77/+0
|\ \ \ \ \
| * | | | | Move admin application spinach test to rspecSemyon Pupkov2016-12-173-77/+0
| |/ / / /
* | | | | Move admin deploy keys spinach test to rspecSemyon Pupkov2016-12-172-62/+0
|/ / / /
* | | | Merge branch 'move-admin-active-tab-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-152-95/+0
|\ \ \ \
| * | | | Move admin active tab spinach tests to rspecSemyon Pupkov2016-12-122-95/+0
| | |_|/ | |/| |
* | | | Merge branch 'jej-24637-move-issue-visible_to_user-to-finder' into 'security' Sean McGivern2016-12-152-1/+3
* | | | Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-141-1/+1
|\ \ \ \
| * | | | Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-111-1/+1
| |/ / /
* | | | Merge branch 'move-admin-settings-feature-to-rspec' into 'master' Rémy Coutable2016-12-133-85/+0
|\ \ \ \
| * | | | Move admin settings spinach feature to rspecjurre2016-12-133-85/+0
| |/ / /
* | | | fix failing testsMike Greiling2016-12-101-1/+1
|/ / /
* | | Group links spec updatePhil Hughes2016-12-091-1/+1
* | | Updated members dropdownsPhil Hughes2016-12-072-2/+11
* | | Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-072-24/+0
|\ \ \
| * | | Move admin hooks spinach to rspecSemyon Pupkov2016-12-062-24/+0
| | |/ | |/|
* | | Merge branch 'move-admin-logs-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-072-19/+0
|\ \ \
| * | | Move admin logs spinach test to rspecSemyon Pupkov2016-12-062-19/+0
| |/ /
* | | Update effected testszj-guest-reads-public-buildsZ.J. van de Weg2016-12-041-1/+1
|/ /
* | Merge branch '22781-user-generated-permalinks' into 'master' Fatih Acet2016-12-011-1/+1
|\ \
| * | remove underscore from user-content id namespace22781-user-generated-permalinksMike Greiling2016-11-301-1/+1
| * | update gitlab flavored markdown tests to reflect namespaced idsMike Greiling2016-11-301-1/+1
* | | fix tests broken by new wiki page designMike Greiling2016-11-303-18/+9
|/ /
* | Homogenize dropdowns on Issue pageDavid Wagner2016-11-281-3/+3
* | Pass `--load-images=no` to PhantomJS via Capybara/Poltergeistrs-phantomjs-disable-imagesRobert Speicher2016-11-281-1/+9
* | Merge branch 'rephrase-system-notes' into 'master' Robert Speicher2016-11-252-2/+2
|\ \
| * | Rephrase some system notes to be compatible with new system note stylerephrase-system-notesDouwe Maan2016-11-242-2/+2
| |/
* | Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-242-36/+0
|\ \
| * | Move admin spam spinach test to RspecSemyon Pupkov2016-11-232-36/+0
| |/
* | Merge branch 'dz-allow-nested-group-routing' into 'master' Douwe Maan2016-11-243-2/+9
|\ \
| * | Add nested groups support to the routingdz-allow-nested-group-routingDmitriy Zaporozhets2016-11-233-2/+9
| |/
* | Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master' Rémy Coutable2016-11-242-23/+0
|\ \