summaryrefslogtreecommitdiff
path: root/features/project
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Fix project snippets button appearing when it is disabledStan Hu2015-05-271-0/+5
| | | | Closes #1705
* Merge branch 'accepted-rejected-mrs' into 'master'Dmitriy Zaporozhets2015-05-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Accepted and Rejected tabs to MR lists. Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites. ![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png) ![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png) ![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png) Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201. See merge request !702
| * Update specs.accepted-rejected-mrsDouwe Maan2015-05-251-2/+2
| |
* | Validate wiki page creationJeroen van Baarsen2015-05-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It adds validation to the creation of a wiki page, that way the user gets real feedback instead of just a 404 page if the name of the wiki page was invalid **Why is this needed?** There are a lot of characters that are not allowed in the creation of a wiki page, there is even a small text that is saying: Please don't use spaces. Although we have that text there, we don't actually validate on this. This commit adds validation on the title and gives the user actual feedback. **What issues does this fix?** Fixes http://github.com/gitlabhq/gitlabhq/issues/5357 Fixes https://github.com/gitlabhq/gitlabhq/issues/8565 Fixes https://github.com/gitlabhq/gitlabhq/issues/3913 Fixes https://github.com/gitlabhq/gitlabhq/issues/8166 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Disable "New Issue" and "New Merge Request" buttons when features are ↵Stan Hu2015-05-251-0/+6
|/ | | | | | disabled in project settings Closes #1676
* Use the user list from the target project in a merge requestStan Hu2015-05-221-0/+12
| | | | Closes #1535
* Don't show duplicate deploy keys. Fixes #1516Maran2015-05-081-3/+4
|
* Remove feature tests for old task listsRobert Speicher2015-05-062-69/+4
|
* Fix DB error when trying to tag a repositoryStan Hu2015-04-271-0/+7
| | | | | | | | | | | | | | | | Upon tagging a repository, an error due to a missing migration occurred: ``` PG::Error: ERROR: column "taggings_count" does not exist LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun... ``` Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first migration that created the `tags` and `taggings` table, and added the rest. Closes #1512 Closes https://github.com/gitlabhq/gitlabhq/issues/6867 Closes https://github.com/gitlabhq/gitlabhq/issues/9194
* Change "Sam" to "Dmitriy" in feature stepsrs-sam-to-dmitriyRobert Speicher2015-04-231-8/+8
| | | | | "Sam" was too short and generic and caused invalid test failures due to finding other people with names like "Sammie" or "Samuel" unexpectedly.
* Add feature tests for inviting members.Douwe Maan2015-04-141-0/+6
|
* Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-131-2/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
| * Add project deploy keys tests.Douwe Maan2015-04-031-2/+19
| |
* | Move current user to the top of the list in author/assignee filtersStan Hu2015-04-091-0/+6
| | | | | | | | Closes #1321
* | Fix bug where Wiki pages that include a '/' were no longer accessibleStan Hu2015-04-071-0/+24
|/ | | | Closes #1363
* Support configurable attachment size via Application SettingsStan Hu2015-04-021-0/+1
| | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* Refactor star btn logic for non-logged in user and fix testsDmitriy Zaporozhets2015-03-291-1/+1
|
* Fix tests and unassigned filter for issues. Updated CHANGELOGDmitriy Zaporozhets2015-03-271-5/+1
|
* Fix broken side-by-side diff view on merge request pageStan Hu2015-03-251-0/+7
| | | | Closes #1294
* Fix code unfold not working on Compare commits pageStan Hu2015-03-241-0/+3
| | | | Closes #1274
* Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-172-0/+15
|\ | | | | | | | | | | | | | | | | | | | | | | Subscription to issue/mr Fixes #1911 and #1909 ![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png) ![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png) See merge request !1702
| * testsValery Sizov2015-03-162-0/+15
| |
* | Use same layout and interactivity for project members as group members.Douwe Maan2015-03-151-1/+1
|/
* Implement merge requests searchDmitriy Zaporozhets2015-03-121-0/+7
| | | | | | | It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues