summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-172-0/+26
|\ | | | | | | | | | | | | | | | | | | Prevent the last owner of a group from being able to delete themselves by 'adding' themselves as a master Replaces !1708. Fixes #1111. See merge request !1815
| * Merge branch 'master' into james11/gitlab-ce-removable-group-ownerDouwe Maan2015-11-1713-36/+116
| |\
| * | fixed last group owner issue and added testJames Lopez2015-10-292-0/+26
| | |
* | | Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-171-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
| * | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-161-1/+1
| | | | | | | | | | | | | | | This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
* | | Create milestones in the groupDmitriy Zaporozhets2015-11-163-1/+34
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Avoid render edit_form in each notes.Jason Lee2015-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RJS to render edit note feature. Before: ``` Rendered projects/notes/_note.html.haml (27.9ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.7ms) Rendered projects/_md_preview.html.haml (3.9ms) Rendered projects/notes/_edit_form.html.haml (6.9ms) Rendered projects/notes/_note.html.haml (17.7ms) Rendered projects/_zen.html.haml (0.3ms) Rendered projects/notes/_hints.html.haml (0.6ms) Rendered projects/_md_preview.html.haml (3.4ms) Rendered projects/notes/_edit_form.html.haml (7.0ms) ``` After: ``` Rendered projects/notes/_note.html.haml (13.8ms) Rendered projects/notes/_note.html.haml (7.1ms) Rendered projects/notes/_note.html.haml (9.5ms) Rendered projects/notes/_note.html.haml (8.5ms) ``` This change reduce at least 6ms * N ('N' - number of notes).
* | Merge branch 'improve-ci-graphs'Dmitriy Zaporozhets2015-11-101-3/+3
|\ \
| * | Fix graph description and textimprove-ci-graphsDmitriy Zaporozhets2015-11-101-3/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'issue_3072_target_name' into 'master' Dmitriy Zaporozhets2015-11-102-0/+29
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display target branch on MR list when it is different from project's default Fixes #3072 The screenshot below shows both previous and current UI state: ![branch-mr-both](/uploads/5c1f0519e42bae4655f3eee37edfc356/branch-mr-both.png) First merge request has default branch as a target, second one has non default branch as target. See merge request !1741
| * | Display target branch on MR list when it is different from project's defaultAnton Baklanov2015-11-102-0/+29
| | |
* | | Add tests to release notes featureDmitriy Zaporozhets2015-11-062-0/+32
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix testDmitriy Zaporozhets2015-11-062-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Rewrite remove tag testDmitriy Zaporozhets2015-11-062-27/+7
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-profile-page'Dmitriy Zaporozhets2015-11-032-5/+11
|\ \
| * | Fix testsDmitriy Zaporozhets2015-11-032-5/+11
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Better name for up-level linksgo-to-navDmitriy Zaporozhets2015-11-033-4/+4
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ability to create directories in the editorBen Ford2015-10-292-0/+25
| | | | | | | | | | | | | Simply type a name with a `/` directory separator and new directories will be created. This does not do the fancy UI work that github.com does, but it will get the job done. I could not find tests for file creation, so I didn't add a test for this slight behaviour modification. I did test directory traversals though, using both absolute paths like `/tmp/foo.txt` and relative paths like `../../foo.txt`. Neither case escaped the repository, though attempting to traverse with a relative path resulted in a 500 error that did not affect application stability upon reload.
* Fix rubocop issuesci-status-mr-indexDmitriy Zaporozhets2015-10-231-5/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add tests for MR index pageDmitriy Zaporozhets2015-10-232-0/+19
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-showDouwe Maan2015-10-212-3/+3
|\
| * Merge branch 'user-page-new-ui' into 'master' Dmitriy Zaporozhets2015-10-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | Implement new UI for user page. Part 1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1615
| | * Partly implement new UI for user pageuser-page-new-uiDmitriy Zaporozhets2015-10-161-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix readme speccristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-181-2/+2
| | |
* | | Fix specDouwe Maan2015-10-181-1/+1
| | |
* | | Restore dashboard snippets tabs.Douwe Maan2015-10-181-3/+3
| | |
* | | Merge branch 'master' into add-dates-snippets-showHan Loong Liauw2015-10-178-9/+43
|\ \ \ | |/ /
| * | Add tests for last commit info on project home pageDmitriy Zaporozhets2015-10-162-0/+13
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
| | * Fix specsKamil Trzcinski2015-10-141-1/+1
| | |
| * | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-152-0/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error preventing displaying of commit data for a directory with a leading dot Directories with leading dots erroneously get rejected by the route controller if git ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller. Closes https://github.com/gitlabhq/gitlabhq/issues/8763 See merge request !1574
| | * | Fix error preventing displaying of commit data for a directory with a ↵Stan Hu2015-10-122-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763
| * | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-141-0/+2
| | |/ | |/|
| * | Fix spinach tests introduced by 07101cfab61f28c6328efebea98f018ab8356cddKamil Trzcinski2015-10-142-8/+8
| | |
* | | fix spinach features to use new button wordingsHan Loong Liauw2015-10-154-8/+8
|/ / | | | | | | Also fixed an accidental deletion of pratial
* | Fix feature testsKamil Trzcinski2015-10-121-1/+1
|/
* Add directory feature buttonStan Hu2015-10-072-18/+76
| | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557
* Render CI statuses on commit pageDmitriy Zaporozhets2015-10-062-2/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix rubocop warnings in featuresGuilherme Garnier2015-10-035-31/+29
|
* Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-022-0/+5
|\
| * Hide password in the service settings formhide_services_passwordValery Sizov2015-10-022-0/+5
| |
* | Prevent creating 2 Ci::Project entities when enable CIDmitriy Zaporozhets2015-10-022-2/+2
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'disable-report-button-if-already-reported' into 'master' Douwe Maan2015-10-012-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the "Report abuse" button if a user has already been reported Hello, I've implemented the feature request #2330. Here is what it looks like: ![report-abuse-button-disabled](https://gitlab.com/rymai/gitlab-ce/uploads/420d51906eac1c40c50701a0a340474f/report-abuse-button-disabled.png) I hope that's an acceptable solution. cc @DouweM See merge request !1456
| * Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reportedRémy Coutable2015-09-292-4/+3
| | | | | | | | | | | | This simplifies the "Report button" to not use open a dropdown and adds a tooltip on this button. This also removes an extra spec and adds missing specs.
| * Disable the "Report abuse" button if a user has already been reportedRémy Coutable2015-09-292-0/+12
| |
* | Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-302-36/+36
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testsKamil Trzcinski2015-09-292-2/+2
|/
* Merge branch 'projects'Dmitriy Zaporozhets2015-09-281-2/+1
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix testsDmitriy Zaporozhets2015-09-251-2/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix grammar in admin area labels .nothing-here-block when no labels exist.Aaron Snyder2015-09-261-1/+1
| | | | | | | | updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
View Lorry Controller Status