summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | Fix specedit-on-forkDouwe Maan2015-12-211-2/+2
| | | | |
| | * | | Add tests for new functionalityDouwe Maan2015-12-212-14/+117
| | | | |
| | * | | Fix specsDouwe Maan2015-12-191-1/+1
| | | | |
| | * | | Merge branch 'master' into edit-on-forkDouwe Maan2015-12-182-2/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/tree/_tree_header.html.haml
| | * | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-181-3/+3
| | | | | |
| | * | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-181-1/+1
| | | | | |
| * | | | | Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-242-1/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JS validation for invalid characters in branch name Fixes #3293 Demo: ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif) See merge request !2122
| | * | | | | Fix minor stylistic complaintsDouglas Barbosa Alexandre2015-12-211-1/+1
| | | | | | |
| | * | | | | Merge branch 'master' into branch-invalid-nameDouglas Barbosa Alexandre2015-12-182-2/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Add JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-172-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info about valid ref names: https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht ml
| | * | | | | Add more descriptive error message when create branch with invalid nameDouglas Barbosa Alexandre2015-12-161-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'issue_4189' into 'master' Douwe Maan2015-12-242-0/+12
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. Closes #4189 See merge request !2169
| | * | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189Rubén Dávila2015-12-212-0/+12
| | | | | |
* | | | | | fixes after reviewValery Sizov2015-12-241-1/+1
| | | | | |
* | | | | | emoji picker searchValery Sizov2015-12-232-0/+18
|/ / / / /
* | | | | add some spinachValery Sizov2015-12-222-0/+12
| | | | |
* | | | | fix specsValery Sizov2015-12-221-2/+2
|/ / / /
* | | | Backport JIRA serviceDrew Blessing2015-12-182-0/+24
| |/ / |/| |
* | | Upgrade Poltergeist to 1.8.1. #4131issue_4131Rubén Dávila2015-12-172-2/+3
|/ /
* | Fix specfix-milestone-snippet-headerDouwe Maan2015-12-161-1/+1
| |
* | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-162-3/+3
| |
* | Merge branch 'master' into fix-milestone-snippet-headerDouwe Maan2015-12-167-23/+23
|\ \
| * \ Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-167-23/+23
| |\ \
| | * | Fixed Rubocop offensesGabriel Mazetto2015-12-157-23/+23
| | | |
* | | | Fix testsDouwe Maan2015-12-161-1/+1
|/ / /
* | | Add spinach test for note pollingGrzegorz Bizon2015-12-153-1/+17
| |/ |/| | | | | | | This also increases capybara timeout to 15 seconds (note polling interval). Capybara will look for new note for this period of time.
* | Preserve trailing new lines at the end of file on the online editorDouglas Barbosa Alexandre2015-12-142-0/+19
|/ | | | | Because Haml automatically indents the HTML source code, the contents of whitespace-sensitive tags like pre and textarea can get screwed up.
* Update commits spinach tests related to displaying build statusGrzegorz Bizon2015-12-142-1/+6
|
* Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-145-19/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci Project migrate - This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`. - This requires offline migrations. - It simplifies database models making all CI objects to be attached to: Project. - It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers). - We should add default `timeout` to Application Settings. - It misses specs. - It is based on ci-services-migrate for now. - It removes CI events. - It removes administrator CI projects overview. - It removes CI application settings. In 8.4 or 8.5 we can remove redundant tables and columns. See merge request !1987
| * Migrate CI::Project to ProjectKamil Trzcinski2015-12-115-19/+3
| |
* | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-141-0/+2
|\ \ | |/ | | | | | | | | | | Ci Services migrate See merge request !1985
| * Fix specsKamil Trzcinski2015-12-102-8/+8
| |
| * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-103-8/+10
| |
* | Remove note from MR discussion when deleting it in the changes tabDouglas Barbosa Alexandre2015-12-102-0/+29
| |
* | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' Robert Speicher2015-12-102-0/+35
|\ \ | |/ |/| | | | | | | | | Fix editing notes on a merge request diff Fixes #3910 See merge request !2041
| * Merge branch 'master' into fix-edit-notes-on-merge-request-diffDouglas Barbosa Alexandre2015-12-0923-3/+146
| |\
| * | Ensure notes are replaced on a merge request diff when they're updatedDouglas Barbosa Alexandre2015-12-092-0/+35
| | |
* | | Merge branch 'move-network'Dmitriy Zaporozhets2015-12-093-10/+12
|\ \ \
| * | | Fix test for network shortcutmove-networkDmitriy Zaporozhets2015-12-093-5/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Move Network page from separate tab to sub tab of CommitsDmitriy Zaporozhets2015-12-093-9/+10
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-092-2/+2
|\ \ \ | |_|/ |/| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'master' into mr-brokenDouwe Maan2015-12-082-0/+14
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/helpers/ci_status_helper.rb
| * | | Use "Build passed" in tooltip instead of "Build status: passed"Douwe Maan2015-12-082-2/+2
| | | |
* | | | Merge branch 'rs-default-clone-fixes' into 'master' Robert Speicher2015-12-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Simplify shared User SSH key steps See merge request !2043
| * | | | Simplify shared User SSH key stepsRobert Speicher2015-12-091-2/+2
| | | | |
* | | | | Merge branch 'split-up-builds' into 'master' Dmitriy Zaporozhets2015-12-0913-1/+13
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization See merge request !2036
| * | | | Tag feature specsDouwe Maan2015-12-0913-1/+13
| | |_|/ | |/| |
* | | | Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' Robert Speicher2015-12-095-2/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering the clone page, check user profile to decide default clone protocol If the user has uploaded SSH-keys, use SSH; otherwise, use http(s). Closes #3504. See merge request !1998
| * \ \ \ Merge branch 'master' into default_clone_protocol_based_on_user_keysEirik Lygre2015-12-0914-31/+106
| |\ \ \ \ | | |/ / /
| * | | | Move ssh-key steps into SharedUser. Change references in "Explore Projects" ↵Eirik Lygre2015-12-095-10/+14
| | | | | | | | | | | | | | | | | | | | feature. Apply ssh-key requirement to "Project Create" feature.
View Lorry Controller Status