summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-233-0/+39
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix downloading of patches on public merge requests when user logged out ### What does this MR do? This MR makes it possible to download a diff patch on a public merge request when a user is logged out. ### Why was this MR needed? An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button: ``` NoMethodError - undefined method `id' for nil:NilClass: lib/gitlab/backend/shell_env.rb:9:in `set_env' lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite' lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite' app/models/merge_request.rb:219:in `to_diff' app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show' ``` ### What are the relevant issue numbers? * Closes #1225 * Closes #1854 (dup) * Closes #1858 (dup) See merge request !872
| * Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-233-0/+39
| | | | | | | | | | | | Closes #1225 Closes #1854 Closes #1858
* | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-232-1/+60
|\ \ | |/ |/| | | | | | | | | | | | | | | Admin can see, edit and remove user identities Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !843
| * Fix tests for admin identities after migrate to rspec3Dmitriy Zaporozhets2015-06-231-5/+2
| |
| * Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-233-9/+9
| |\
| * \ Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-2219-199/+124
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/admin/users/show.html.haml
| * | | Fix indendity testDmitriy Zaporozhets2015-06-222-5/+14
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add tests for admin managing user identitiesDmitriy Zaporozhets2015-06-192-1/+54
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-2314-64/+97
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb
| * | | Merge branch 'fix-project-icon-links' into 'master'Dmitriy Zaporozhets2015-06-233-9/+9
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fix avatar tests to use banana_sample.gif Fixes tests that were broken in f5e0e5c0 due to the purge of `gitlab_logo.png`. See merge request !866
| | * | Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu2015-06-223-9/+9
| | | |
| * | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-222-5/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| | * | Revert merge request states renamingDmitriy Zaporozhets2015-06-192-5/+5
| | |/ | | | | | | | | | | | | | | | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix features syntaxRobert Speicher2015-06-2212-51/+83
| | |
| * | Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-0/+1
| | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Fix rubocop issues at feature/ directoryDmitriy Zaporozhets2015-06-229-37/+35
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-203-1/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when one user attempts to access another's personal, internal snippet ### What does this MR do? This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce: ### Why was this MR needed? 1. Go to `<hostname>/snippets/new`. 2. Select "Internal". 3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`) 4. Logout and sign in as another user. 5. Go to the URL in step 3. ### What are the relevant issue numbers? Closes #1815 See merge request !854
| * | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-193-1/+36
| |/ | | | | | | Closes #1815
* | Remove "Multiselect Blob" feature specsRobert Speicher2015-06-192-143/+0
|/ | | | These are well covered by the new Jasmine tests, and faster!
* Merge branch 'support-comment-parallel-diff' into 'master'Douwe Maan2015-06-163-8/+55
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support commenting on a diff in side-by-side view ### What does this MR do? This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment. There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later. ### Why was this MR needed? Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9283 ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png) See merge request !810
| * Support commenting on a diff in side-by-side viewStan Hu2015-06-163-8/+55
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* | Merge branch 'applications_form' into 'master'Douwe Maan2015-06-161-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UI issues in Applications form @douwe Thanks for reviewing this small fix. --- Before: ![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png) --- After: ![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png) See merge request !1859
| * Fix consistency issues on New Application page.Nicolas2015-06-151-1/+1
| |
* | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-132-34/+0
| |
* | Add Profiles::PreferencesControllerRobert Speicher2015-06-133-7/+7
|/
* Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | | | | | | There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
* Change `within` to `page.within` in feature stepsRobert Speicher2015-06-1234-159/+159
|
* Update all `should`-style syntax to `expect` in featuresRobert Speicher2015-06-1269-662/+662
|
* Fix test for accept merge requestDmitriy Zaporozhets2015-06-121-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix merge request testrefactor-mr-widgetDmitriy Zaporozhets2015-06-111-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use stub_const to stub constants instead of redefining themRobert Speicher2015-06-101-2/+1
| | | | They're called constants for a reason, after all.
* Move Project Members link from Settings to main menu.Nicolas2015-06-093-7/+13
| | | | Addresses #2278.
* Properly click on user profile pictureimprove-navigationDmitriy Zaporozhets2015-06-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix testsDmitriy Zaporozhets2015-06-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-remove-guard' into 'master'Dmitriy Zaporozhets2015-06-041-1/+0
|\ | | | | | | | | | | | | | | | | | | Remove Guard None of the GitLab B.V. developers were using it. See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360 See merge request !764
| * Remove unnecessary require from Spinach envRobert Speicher2015-06-041-1/+0
| |
* | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-032-16/+0
|/
* Merge branch 'support-edit-target-branch-in-mr' into 'master'Dmitriy Zaporozhets2015-05-293-2/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support editing target branch of merge request ### What does this MR do? This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens. ### Why was this MR needed? Because lots of people requested this feature. :) ### Screenshots **Edit MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png) **New MR page** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png) **System note** ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png) ### What are the relevant issue numbers? * Closes https://github.com/gitlabhq/gitlabhq/issues/7105 * See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130! See merge request !738
| * Support editing target branch of merge requestStan Hu2015-05-293-2/+24
| | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
* | Fix tests for group leave featureDmitriy Zaporozhets2015-05-292-1/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #9318 from jvanbaarsen/allow-special-chars-bioDmitriy Zaporozhets2015-05-291-11/+13
|\ \ | | | | | | Allow special characters in users bio
| * | Allow special characters in users bioJeroen van Baarsen2015-05-281-11/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It removes the very strict sanitation on the users bio field, so that people can have a bio like "I <3 GitLab" **Why is this needed?** Currently when you enter a bio with "I <3 GitLab", we only store "I ". This is unexpected behaviour, since we want users to have a normal profile, without having to worry what characters are allowed and which are not. **Related issues:** Fixes https://github.com/gitlabhq/gitlabhq/issues/5625 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Fix profile tests after header renameDmitriy Zaporozhets2015-05-282-2/+2
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Persist current merge request tab selection via URLrs-persist-tab-selectionRobert Speicher2015-05-271-1/+4
| | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
* Merge branch 'browse-milestone-issues' into 'master'Douwe Maan2015-05-271-2/+2
|\ | | | | | | | | | | | | | | Fix milestone "Browse Issues" button. After refactoring around issue/merge requests filters, the button stopped working :( See merge request !699
| * Fix spec.browse-milestone-issuesDouwe Maan2015-05-271-2/+2
| |
* | Fix project snippets button appearing when it is disabledStan Hu2015-05-273-0/+14
|/ | | | Closes #1705
* Merge branch 'accepted-rejected-mrs' into 'master'Dmitriy Zaporozhets2015-05-272-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-6/+6
| |
* | Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creationJeroen van Baarsen2015-05-262-0/+15
|\ \ | | | | | | Validate wiki page creation
View Lorry Controller Status