summaryrefslogtreecommitdiff
path: root/features/steps
Commit message (Collapse)AuthorAgeFilesLines
* Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-151-5/+5
| | | | | | | | | | | | | | 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
* Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-2/+81
|\ | | | | add "replace" and "upload" functionality
| * Add "Replace" and "Upload" featuresliyakun2015-09-151-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-141-0/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all group public https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219# Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361 See merge request !1247
| * | Make all group publicValery Sizov2015-09-091-0/+20
| | |
* | | Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets2015-09-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import forked repositories asynchronously to prevent large repositories from timing out Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former. One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked. * Closes #2388 * Closes #2400 See merge request !1231
| * | | Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu2015-09-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
* | | Merge branch 'master' into dashboard-titlesdashboard-titlesDouwe Maan2015-09-102-2/+121
|\ \ \ | |/ /
| * | Fix testStan Hu2015-09-101-2/+4
| | |
| * | Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-091-0/+117
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
| | * added spinach for glabal labelsglobal_labelsValery Sizov2015-09-031-0/+117
| | |
* | | Fix snippets exploration testDouwe Maan2015-09-091-1/+1
| | |
* | | Fix specDouwe Maan2015-09-091-1/+1
| | |
* | | Use new routing helperDouwe Maan2015-09-081-1/+1
| | |
* | | Clean up overlap between dashboard and explore.Douwe Maan2015-09-081-1/+1
| | | | | | | | | | | | | | | - Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
* | | Consistently case `Back to X` links.Douwe Maan2015-09-082-3/+3
|/ /
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-072-3/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * fix project home page when activity set as default * style commits, branches and tags pages to new style * render flash message outside of content block * style group pages See merge request !1255
| * | Fix compare testsDmitriy Zaporozhets2015-09-071-1/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix testsDmitriy Zaporozhets2015-09-071-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'crowd' into 'master'Valery Sizov2015-09-071-0/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
| * | | satisfy rubocopcrowdValery Sizov2015-09-072-21/+25
| | | |
| * | | added spinachValery Sizov2015-09-021-0/+21
| | |/ | |/|
* | | Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan2015-09-071-1/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken Wiki Page History This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes. Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399 See merge request !1232
| * | Fix broken Wiki Page HistoryStan Hu2015-09-011-1/+8
| |/ | | | | | | | | | | | | | | | | | | Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
* | Fix this crazy random failing testDmitriy Zaporozhets2015-09-042-1/+5
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix failing testDmitriy Zaporozhets2015-09-041-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testsDmitriy Zaporozhets2015-09-031-1/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testsDmitriy Zaporozhets2015-09-032-3/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix tests and update CHANGELOGrefactor-starred-projects-pageDmitriy Zaporozhets2015-09-021-1/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'enable_ssl_verification_web_hook' into 'master'Dmitriy Zaporozhets2015-08-262-0/+28
|\ | | | | | | | | | | | | | | 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-262-0/+28
| |
* | Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets2015-08-251-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate activity page Move activity to separate page. Part of #2225 ![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png) See merge request !1198
| * | Fix tests and last push widgetseparate-activityDmitriy Zaporozhets2015-08-251-0/+4
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'Dmitriy Zaporozhets2015-08-251-0/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | 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-241-0/+6
| | | | | | | | | | | | 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-241-0/+11
|/
* Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-0/+15
|\ | | | | | | | | | | | | | | | | | | 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-211-0/+15
| | | | | | | | | | | | 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-201-1/+30
|/
* Spinach testsArtem Sidorenko2015-08-194-0/+52
|
* Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-194-11/+5
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * 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-101-0/+4
| |\
| * | 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>
View Lorry Controller Status