summaryrefslogtreecommitdiff
path: root/features/project
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_3072_target_name' into 'master' Dmitriy Zaporozhets2015-11-101-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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-101-0/+9
| |
* | Add tests to release notes featureDmitriy Zaporozhets2015-11-061-0/+12
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testDmitriy Zaporozhets2015-11-061-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Rewrite remove tag testDmitriy Zaporozhets2015-11-061-8/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add ability to create directories in the editorBen Ford2015-10-291-0/+10
| | | | | | | | | | | | | 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.
* Add tests for MR index pageDmitriy Zaporozhets2015-10-231-0/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into add-dates-snippets-showHan Loong Liauw2015-10-172-0/+12
|\
| * Add tests for last commit info on project home pageDmitriy Zaporozhets2015-10-161-0/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix error preventing displaying of commit data for a directory with a ↵Stan Hu2015-10-121-0/+6
| | | | | | | | | | | | leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763
* | fix spinach features to use new button wordingsHan Loong Liauw2015-10-151-1/+1
|/ | | | Also fixed an accidental deletion of pratial
* Add directory feature buttonStan Hu2015-10-071-8/+25
| | | | | | | | | | | | | | | | | | 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-061-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Hide password in the service settings formhide_services_passwordValery Sizov2015-10-021-0/+1
|
* Fix invalid testsfix-removed-file-in-diffDmitriy Zaporozhets2015-09-301-18/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Show CI status on commit pagebuild-status-on-commit-pageDmitriy Zaporozhets2015-09-241-0/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move CI charts to project graphs areaDmitriy Zaporozhets2015-09-231-0/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-211-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
| * Merge branch 'master' into notification-levelsPatricio Cano2015-09-161-0/+23
| |\
| * | Added Spinach tests and updated CHANGELOGPatricio Cano2015-09-161-0/+6
| | |
* | | Merge branch 'fix-issue-2382' into 'master'Stan Hu2015-09-171-2/+6
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
| * | Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu2015-09-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
* | | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-151-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamically adjust placedholder for uploads and fix Dropzone event handlers Override error handler to prevent error messages from being inserted underneath image preview Fix tests Use regexp instead of startsWith for better browser compatibility Remove duplicate code in _replace.html.haml and use one template Remove files upon error and retain alert messages until user adds a new file
* | Add "Replace" and "Upload" featuresliyakun2015-09-151-0/+23
|/ | | | | | | | | | | | | | | | Refactor upload and replace functionality Rename file and move CSS Fix typo Make dropzone a div Remove unnecessary file Change color of "upload existing one" Add missing changes
* Fix broken Wiki Page HistoryStan Hu2015-09-011-0/+12
| | | | | | | | | | Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
* Merge branch 'enable_ssl_verification_web_hook' into 'master'Dmitriy Zaporozhets2015-08-261-0/+5
|\ | | | | | | | | | | | | | | Enable SSL verification for Webhooks https://dev.gitlab.org/gitlab/gitlabhq/issues/2121 See merge request !1135
| * Enable SSL verification for Webhooksenable_ssl_verification_web_hookValery Sizov2015-08-261-0/+5
| |
* | Fix "Reload with full diff" URL button in compare branch viewStan Hu2015-08-241-0/+1
|/ | | | | | This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view.
* Fix network graph when branch name has single quotesStan Hu2015-07-291-0/+5
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9500
* Fix commit data retrieval when branch name has single quotesStan Hu2015-07-261-0/+7
| | | | Closes #1724
* Add support for destroying project milestonesStan Hu2015-07-171-0/+4
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
* Make left menu more hierarchical and less contextual by adding back item at topDmitriy Zaporozhets2015-07-101-0/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix project testsproject-home-pageDmitriy Zaporozhets2015-07-081-13/+5
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix schortcut testsDmitriy Zaporozhets2015-07-081-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Cleanup and some test fixes after refactoring project home pageDmitriy Zaporozhets2015-07-082-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add shortcut for project activity pageDmitriy Zaporozhets2015-07-081-1/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix "Project Forked Merge Requests" scenarioRobert Speicher2015-06-261-1/+0
|
* Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-261-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | Reorder MergeRequestTabs constructor The tab was being activated before we set the `[commits|diffs]Loaded` variable, so even when the `/diffs` route is accessed directly, like from the "Side-by-side" link, the tab was being loaded from its default source. Fixes #1887 See merge request !892
| * Fix merge request diff featuresrs-issue-1887Robert Speicher2015-06-251-8/+8
| |
* | Write test for submitting issue as guestDmitriy Zaporozhets2015-06-251-0/+12
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets2015-06-231-1/+1
|\ | | | | | | | | | | | | | | Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
| * Refactor rake tasks for testsDmitriy Zaporozhets2015-06-231-1/+1
| |
* | Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-231-0/+12
|/ | | | | | Closes #1225 Closes #1854 Closes #1858
* Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-221-1/+1
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| * Revert merge request states renamingDmitriy Zaporozhets2015-06-191-1/+1
| | | | | | | | | | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix features syntaxRobert Speicher2015-06-222-1/+2
| |
* | Remove "Multiselect Blob" feature specsRobert Speicher2015-06-191-85/+0
|/ | | | These are well covered by the new Jasmine tests, and faster!
* Support commenting on a diff in side-by-side viewStan Hu2015-06-161-0/+14
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* Move Project Members link from Settings to main menu.Nicolas2015-06-091-7/+5
| | | | Addresses #2278.
* Support editing target branch of merge requestStan Hu2015-05-291-0/+8
| | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
View Lorry Controller Status