summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'Dmitriy Zaporozhets2015-08-252-0/+7
|\ | | | | | | | | | | | | | | | | | | Fix "Reload with full diff" URL button in compare branch view 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. See merge request !1195
| * Fix "Reload with full diff" URL button in compare branch viewStan Hu2015-08-242-0/+7
| | | | | | | | | | | | 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.
* | Ability to search milestonesmilestone_searchValery Sizov2015-08-242-0/+26
|/
* Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-212-0/+21
|\ | | | | | | | | | | | | | | | | | | Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
| * Fix bug preventing invite by e-mailStan Hu2015-08-212-0/+21
| | | | | | | | | | | | This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-201-1/+1
|\ \
| * | Fix testDmitriy Zaporozhets2015-08-201-1/+1
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Import sources: show only enabled sourcesArtem Sidorenko2015-08-202-2/+48
|/
* Spinach testsArtem Sidorenko2015-08-197-4/+81
|
* Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-195-11/+9
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix tests for web editorDmitriy Zaporozhets2015-08-141-0/+4
| |
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-111-1/+1
| |\ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-114-11/+5
| | | | | | | | | | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* | | capitalize URL in "Home page URL"Ben Bodenmiller2015-08-171-1/+1
| |/ |/|
* | Merge branch 'check-out-branch-button' into 'master' Dmitriy Zaporozhets2015-08-111-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120. ![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png) It looks even better in combination with !1121, which gets rid of the "If you want to ..." line: ![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png) cc @dzaporozhets @rspeicher See merge request !1116
| * Merge branch 'master' into check-out-branch-buttoncheck-out-branch-buttonDouwe Maan2015-08-102-0/+6
| |\
| * | Fix specDouwe Maan2015-08-101-1/+1
| | |
* | | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-114-5/+11
| |/ |/| | | | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'gravatar-host-link' into 'master'Stan Hu2015-08-092-0/+6
|\ \ | |/ |/| | | | | | | | | | | link to configured gravatar host on profile page This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service. See merge request !1093
| * ink to configured gravatar host on profile pageBen Bodenmiller2015-08-052-0/+6
| |
* | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-074-4/+4
| | | | | | | | Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
* | Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-061-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always add current user to autocomplete controller to support filter by "Me" ### What does this MR do? This MR always adds the current user to the autocomplete list of users. ### Why was this MR needed? Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list. ### What are the relevant issue numbers? Partial fix #2202 See merge request !1100
| * | Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-061-2/+3
| |/ | | | | | | Partial fix #2202
* | Remove trailing linesreport-spamDmitriy Zaporozhets2015-08-061-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add tests for abuse report featureDmitriy Zaporozhets2015-08-065-0/+67
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-047-3/+61
|\ \ | |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix network graph when branch name has single quotesStan Hu2015-07-292-2/+17
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9500
| * Fix commit data retrieval when branch name has single quotesStan Hu2015-07-262-0/+24
| | | | | | | | Closes #1724
| * Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-1/+8
| |
| * Add support for destroying project milestonesStan Hu2015-07-172-0/+12
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/1504
* | Use real branches from test repoDmitriy Zaporozhets2015-07-161-4/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix application initializeDmitriy Zaporozhets2015-07-151-1/+1
| |
* | Remove satellitesDmitriy Zaporozhets2015-07-152-6/+0
|/
* Make left menu more hierarchical and less contextual by adding back item at topDmitriy Zaporozhets2015-07-104-0/+31
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve readme testsDmitriy Zaporozhets2015-07-091-3/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont check for link but for actual readme contentDmitriy Zaporozhets2015-07-091-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix project testsproject-home-pageDmitriy Zaporozhets2015-07-082-13/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix creating file in new repoDmitriy Zaporozhets2015-07-081-1/+1
| | | | 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-085-2/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add shortcut for project activity pageDmitriy Zaporozhets2015-07-082-1/+12
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Audit log for user authenticationValery Sizov2015-07-065-9/+9
|
* Merge branch 'improve-spinach-test-for-mr-submit' into 'master'Stan Hu2015-07-011-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Add an expect call to prevent random Spinach failure This should help prevent getting the error: ``` Unable to find field "merge_request_title ``` This was happening probably because it takes some time after the "Compare branches" button is hit before the "New merge request" page showed up. See merge request !882
| * Add an expect call to prevent random Spinach failure:Stan Hu2015-06-231-0/+1
| | | | | | | | "Unable to find field "merge_request_title"
* | Merge branch 'group_settings_nav' into 'master'Douwe Maan2015-07-011-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix consistency issue in sidebars of Project and Group Settings. Fixes #2277 ![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png) See merge request !1871
| * | Fix consistency issue in sidebars of Project and Group Settings.Nicolas2015-06-241-2/+2
| |/ | | | | | | Fixes #2277.
* | Merge branch 'rs-fix-subscription-feature' into 'master'Dmitriy Zaporozhets2015-06-292-5/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Attempt to fix the "I should see that I am [un]subscribed" steps Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step. See merge request !853
| * | Attempt to fix the "I should see that I am [un]subscribed" stepsrs-fix-subscription-featureRobert Speicher2015-06-252-5/+4
| |/ | | | | | | | | Makes use of Capybara methods that wait. Hopefully this will fix the random timing-related failures of this step.
* | Fix "Project Forked Merge Requests" scenarioRobert Speicher2015-06-261-1/+0
| |
* | Merge branch 'rs-issue-1887' into 'master'Dmitriy Zaporozhets2015-06-262-20/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status