summaryrefslogtreecommitdiff
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-072-1/+10
|\
| * Merge branch 'dm-wait-for-pipeline' into 'master' Stan Hu2017-04-071-0/+9
| |\
| | * Actually include WaitForAjax!Douwe Maan2017-04-071-0/+1
| | * Wait for AJAX requests to complete so they don't blow up if they are only han...Douwe Maan2017-04-071-0/+8
| * | Put back usernames in activity and profile feedAnnabel Dunstone Gray2017-04-071-1/+1
| |/
* | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-1/+2
|\ \ | |/
| * Update project build status cache when transitioningBob Van Landuyt2017-04-071-1/+2
* | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0721-55/+67
|\ \ | |/
| * Merge branch 'menu-shortcut' into 'master' Jacob Schatz2017-04-062-3/+3
| |\
| | * Fix broken spinach testFilipa Lacerda2017-04-061-2/+2
| | * Fix shortcut specsAnnabel Dunstone Gray2017-04-061-1/+1
| * | Fixed button capitalisation for Projects in viewsJose Ivan Vargas Lopez2017-04-0615-36/+48
| * | Fix rspec and spinach testsJose Ivan Vargas2017-04-063-12/+12
| * | Groups section capitalization fixJose Ivan Vargas Lopez2017-04-061-2/+2
| * | Dashboard section capitalization fixJose Ivan Vargas Lopez2017-04-061-2/+2
| |/
* | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-065-4/+18
|\ \ | |/
| * Merge branch '29128-profile-page-icons' into 'master' Filipa Lacerda2017-04-061-1/+1
| |\
| | * Update commit icon; fix specs29128-profile-page-iconsAnnabel Dunstone Gray2017-04-031-1/+1
| * | Linking to edit file directlyEric Eastwood2017-04-062-1/+15
| * | Optimise trace handling code to use streaming instead of full readKamil Trzciński2017-04-062-2/+2
* | | Fix some specsDouwe Maan2017-04-051-0/+3
|/ /
* | Merge branch 'sh-fix-award-emoji-transient-spec' into 'master' Rémy Coutable2017-04-051-1/+3
|\ \
| * | Potential fix for intermittent spec failure in award emoji specssh-fix-award-emoji-transient-specStan Hu2017-04-051-1/+3
* | | MR empty stateLuke "Jared" Bennett2017-04-056-7/+13
|/ /
* | Merge branch 'rc/fix-spinach-plus-knapsack-properly' into 'master' Robert Speicher2017-04-042-7/+0
|\ \
| * | Fix a Knapsack issue that would load support/capybara.rb before support/env.rbrc/fix-spinach-plus-knapsack-properlyRémy Coutable2017-04-042-7/+0
| |/
* | Don't use FFaker in factories, use sequences insteadRémy Coutable2017-04-031-2/+2
|/
* Add a wait_for_ajax call to ensure Todos page cleans up properlysh-fix-todos-spinach-failureStan Hu2017-04-021-0/+3
* Fix Spinach and Capybara dependenciesStan Hu2017-04-011-1/+3
* Properly eagerly-load the Capybara server for JS feature specs onlyRémy Coutable2017-03-311-1/+1
* Eager-load the Capybara server to prevent timeoutsRémy Coutable2017-03-311-1/+1
* Increase Capybara's timeoutRémy Coutable2017-03-311-1/+1
* Merge branch 'rs-spinach-reporter' into 'master' Rémy Coutable2017-03-301-0/+16
|\
| * Monkey patch the Spinach StdoutReporter to show scenario locationsRobert Speicher2017-03-291-0/+16
* | Merge branch '23674-simplify-milestone-summary' into 'master' Jacob Schatz2017-03-291-1/+1
|\ \
| * | update milestone page testsMike Greiling2017-03-251-1/+1
* | | Add shortcuts and counters to MRs and issues in navbarAnnabel Dunstone Gray2017-03-291-3/+3
| |/ |/|
* | Fix link togglers jumping to topEric Eastwood2017-03-282-2/+2
* | Fix up emoji tests that should have failed :/Eric Eastwood2017-03-244-5/+5
|/
* Merge branch 'add-blob-copy-button' into 'master' Robert Speicher2017-03-161-2/+2
|\
| * Fix specadd-blob-copy-buttonDouwe Maan2017-03-161-2/+2
| * Fix specDouwe Maan2017-03-161-1/+1
* | Merge branch 'pages-multiple-ips-doc' into 'master' Kamil Trzciński2017-03-161-3/+3
|\ \
| * | The GitLab Pages external-http and external-https arguments can be specified ...Nick Thomas2017-03-081-3/+3
* | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-161-1/+5
|\ \ \
| * | | Add 'Undo mark all as done' to TodosJacopo2017-03-161-1/+5
* | | | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-161-1/+1
| |_|/ |/| |
* | | Merge branch 'rs-capybara-screenshot-artifacts' into 'master' Kamil Trzciński2017-03-141-6/+3
|\ \ \ | |/ / |/| |
| * | Don't disable capybara-screenshot in CI environmentrs-capybara-screenshot-artifactsRobert Speicher2016-12-081-6/+3
* | | Do not show LFS object when LFS is disabledChristopher Bartz2017-03-131-0/+1
View Lorry Controller Status