summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve spec for pipeline metrics workeradd-pipeline-metrics-workerKamil Trzcinski2016-10-173-23/+75
|
* Add Pipeline metrics workerKamil Trzcinski2016-10-173-4/+22
|
* Merge branch 'fix-compare-spec' into 'master' Stan Hu2016-10-171-1/+1
|\ | | | | | | | | | | | | Fix broken rspec in compare text !6910 changed the filter text from "Filter by branch/tag" to "Filter by Git revision" See merge request !6926
| * Fix broken rspec in compare textStan Hu2016-10-161-1/+1
|/ | | | !6910 changed the filter text from "Filter by branch/tag" to "Filter by Git revision"
* Merge branch 'fix-spinach-compare-tests' into 'master' Stan Hu2016-10-174-10/+33
|\ | | | | | | | | | | | | | | | | Fix broken Spinach tests caused by changes in !6550 !6550 added dropdowns for the branch "from" and "to" fields, but these Spinach tests were not updated accordingly. Partial fix to #23378 See merge request !6910
| * Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-163-8/+23
| |
| * Fix broken Spinach tests caused by changes in !6550Stan Hu2016-10-162-7/+15
|/ | | | Partial fix to #23378
* Merge branch 'dz-fix-branches-tab-test' into 'master' Dmitriy Zaporozhets2016-10-161-1/+1
|\ | | | | | | | | | | | | Fix active tab test for branches page For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6923
| * Fix active tab test for branches pagedz-fix-branches-tab-testDmitriy Zaporozhets2016-10-161-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-merge-request-diff-spinach-failures' into 'master' Dmitriy Zaporozhets2016-10-163-4/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Spinach merge request diff failures gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests. Partial fix to #23378 See merge request !6916
| * | Fix merge requests feature testsfix-merge-request-diff-spinach-failuresDmitriy Zaporozhets2016-10-161-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Wait for ajax call in merge request unsubscribe testDmitriy Zaporozhets2016-10-161-0/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Fix Spinach merge request diff failuresStan Hu2016-10-152-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests. Partial fix to #23378
* | | Merge branch 'rs-changelog-markdown' into 'master' Robert Speicher2016-10-165-137/+267
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert CHANGELOG to Markdown All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29 [ci skip] See merge request !6925
| * | | Convert CHANGELOG to MarkdownRobert Speicher2016-10-165-137/+267
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | All this does is convert the version sections into headers. The list items shouldn't really be indented by two spaces, but it makes no difference to the rendering and this way we retain authorship history for the actual changes. Related to https://gitlab.com/gitlab-org/release-tools/merge_requests/29
* | | Merge branch 'docs/change-docs-reviewers' into 'master' Achilleas Pipinellis2016-10-161-5/+5
|\ \ \ | |_|/ |/| | | | | | | | Add the tech writers usernames in the doc_sytleguide doc See merge request !6924
| * | Merge branch 'master' into 'docs/change-docs-reviewers'Achilleas Pipinellis2016-10-16225-1311/+3428
| |\ \ | |/ / |/| | | | | # Conflicts: # doc/development/doc_styleguide.md
* | | Merge branch 'dz-fix-group-milestone-creation' into 'master' Dmitriy Zaporozhets2016-10-161-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 500 error when creating mileston from group page Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6920
| * | | Fix 500 error when creating mileston from group pagedz-fix-group-milestone-creationDmitriy Zaporozhets2016-10-161-4/+5
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'dz-fix-group-with-dot' into 'master' Dmitriy Zaporozhets2016-10-162-1/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 when group path has dot in the name Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23401 See merge request !6919
| * | | Fix 404 when group path has dot in the namedz-fix-group-with-dotDmitriy Zaporozhets2016-10-162-1/+10
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch '23353-add-bookclub-to-university' into 'master' Achilleas Pipinellis2016-10-163-0/+133
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added book club to university ## What does this MR do? Adds the old University Book Club to the new University content ## What are the relevant issue numbers? Closes #23353 See merge request !6888
| * | | Added book club to university23353-add-bookclub-to-universitySean Packham2016-10-143-0/+133
| | | |
* | | | Merge branch 'clarify-cache-and-artifact-paths' into 'master' Achilleas Pipinellis2016-10-161-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a note on valid paths for cache and artifacts in the place users are most likely to learn about the feature. ## Why was this MR needed? We get regular support requests relating to cache and artifacts not being picked up outside the project root. It's intended behaviour, and should be documented. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792 See merge request !6892
| * | | | Document restrictions on cache and artifact pathsNick Thomas2016-10-141-3/+4
| | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1792
* | | | | Merge branch 'sh-fix-ruby-2-1' into 'master' Stan Hu2016-10-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Hash syntax to work for both Ruby 2.1 and 2.3 Ruby 2.1 specs were failing (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/5149275) due the error: ``` SyntaxError: /builds/gitlab-org/gitlab-ce/app/views/devise/shared/_tabs_normal.html.haml:3: syntax error, unexpected ':', expecting => ...'#login-pane', data: {'toggle':'tab'}, role: 'tab')).to_s));... ``` See merge request !6917
| * | | | | Fix Hash syntax to work for both Ruby 2.1 and 2.3sh-fix-ruby-2-1Stan Hu2016-10-151-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-broken-scss-lint' into 'master' Stan Hu2016-10-161-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Fix broken SCSS linter errors due to missing newlines See merge request !6918
| * | | | Fix broken SCSS linter errors due to missing newlinesStan Hu2016-10-151-0/+3
|/ / / /
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceJacob Schatz2016-10-154-10/+18
|\ \ \ \
| * \ \ \ Merge branch 'dz-handle-unmatched-routes' into 'master' Dmitriy Zaporozhets2016-10-153-2/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle unmatched routing with not_found method ## What does this MR do? Handle all unmatched routes with 404 method ## Why was this MR needed? We need this to prevent routing error when user access URL like /123 when there is no resource located under such name. ## What are the relevant issue numbers? Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6733. See merge request !6905
| | * | | | Revert "Update git over http test to match new routing"dz-handle-unmatched-routesDmitriy Zaporozhets2016-10-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 68ab7047dae98172a0bd8b92956f2ee51b9167a0.
| | * | | | Handle unmatched routing with not_found methodDmitriy Zaporozhets2016-10-152-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to prevent routing error when user access URL like /123 when there is no resource located under such name Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'dz-fix-extract-path' into 'master' Dmitriy Zaporozhets2016-10-151-8/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve ExtractsPath logic related to atom format * Fixes one test from https://gitlab.com/gitlab-org/gitlab-ce/issues/23378. * Fixes issue introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6750. See merge request !6907
| | * | | | | Improve ExtractsPath logic related to atom formatdz-fix-extract-pathDmitriy Zaporozhets2016-10-151-8/+9
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't set request format to atom if '.atom' suffix was not provided * Don't try '.atom' detection logic on request that uses extended_sha1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'master' into login-ui-improvementsJacob Schatz2016-10-152-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'remove-ashley' into 'master' Stan Hu2016-10-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove ashley since she no longer works here ## What does this MR do? Merges gitlab-org/gitlab-ee!803 in the right place. This was already merged in EE because I sent the MR there by accident. See merge request !6913
| | * | | | | remove ashley since she no longer works hereDe Wet Blomerus2016-10-151-1/+1
| | | | | | |
| * | | | | | Merge branch 'fix-language-spinach-failure' into 'master' Robert Speicher2016-10-151-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Spinach failure due overprecise percentage matching The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure. Partial fix to #23378 See merge request !6912
| | * | | | | Fix Spinach failure due overprecise percentage matchingfix-language-spinach-failureStan Hu2016-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The percentages in the language match changed by a tenth of a percentage point for Ruby and JavaScript, which led to this failure. Partial fix to #23378
* | | | | | | Revert "Improve tabbing usability for sign in page"login-ui-improvementsBryce Johnson2016-10-151-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8751491b8db471dc661daa19bc82a9dbd58e4aae.
* | | | | | | Don't use member properties in users_spec, and remove loading ref.Bryce Johnson2016-10-151-5/+2
| | | | | | |
* | | | | | | Clean up stray Sign up ref.Bryce Johnson2016-10-151-1/+1
| | | | | | |
* | | | | | | Back off the array spreading, bc poltergeist freaks out.Bryce Johnson2016-10-152-7/+6
| | | | | | |
* | | | | | | Convert dispatcher to es6.Bryce Johnson2016-10-151-0/+0
| | | | | | |
* | | | | | | Add exists to users routes and fix endpoint.Bryce Johnson2016-10-152-1/+2
| | | | | | |
* | | | | | | Attempt to fix username validation ruby.Bryce Johnson2016-10-151-1/+1
| | | | | | |
* | | | | | | Clean up layouts/devise.html.Bryce Johnson2016-10-151-2/+2
| | | | | | |
* | | | | | | Use Ruby 1.9 syntax in tab_single def and usage.Bryce Johnson2016-10-157-8/+7
| | | | | | |
* | | | | | | Fixup invalid refs.Bryce Johnson2016-10-152-2/+2
| | | | | | |