summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Smaller min-width for MR pipeline table23346-pipeline-buttons-cutoffAnnabel Dunstone Gray2016-10-171-0/+4
|
* Merge branch 'fix-pipeline-metrics-failure' into 'master' dz-check-if-green23430-accept-full-linkedin-url-on-gitlab-profile-pageDouwe Maan2016-10-171-2/+2
|\ | | | | | | | | | | | | | | Fix broken specs on MySQL ## What does this MR do? Fixes broken master after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 See merge request !6935
| * Fix broken specs on MySQL after ↵fix-pipeline-metrics-failureKamil Trzcinski2016-10-171-2/+2
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896
* | Merge branch 'fix_test_env' into 'master' Dmitriy Zaporozhets2016-10-171-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Test Env (proper error handling when gitlab-shell is not clonned) ## What does this MR do? If we were not able to clone gitlab-shell we have to stop all test suite, for now we run it regardless we cloned it or not. ## Why was this MR needed? To not confuse developers when build is red, to get fasts feedback, to save resources and time. See merge request !6933
| * | Fix Test Env (proper error handling when gitlab-shell is not clonned)Valery Sizov2016-10-171-1/+3
| |/
* | Merge branch 'safari-is-baNaNas' into 'master' Rémy Coutable2016-10-175-109/+164
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Safari displaying NaN for selected due date ## What does this MR do? 1. Stops using `Date.parse` to parse selected due dates. 2. Refactors DueDateSelectors to be more maintainable and readable ## Are there points in the code the reviewer needs to double check? **To review the actual fix, look here:** https://gitlab.com/gitlab-org/gitlab-ce/commit/4ad43ac3a12902d7ea01dc09f8a361b01c21a0ee. It would be difficult to pick out from the overall diff. ## Why was this MR needed? In Safari, the due date selector was displaying 'NaN' when a date is selected, which was being returned by `Date.parse`. Because `Date.parse` is implemented differently across browsers it's generally recommended to favor implicit Date parsing with the `Date` constructor. For more background on this, [see MDN on Date.parse](https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/Date/parse). Also, the code for DueDateSelector was pretty messy, and its logic was very tightly coupled, so I refactored it. None of the basic logic changed, I just broke it up into smaller pieces and made it more OO. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22984 See merge request !6797
| * Convert due_date_select.js filetype to es6.safari-is-baNaNasBryce Johnson2016-10-175-109/+164
| |
| * Stop directly parsing due_date with Date.parse, prefer parsing implicitly.Bryce Johnson2016-10-171-2/+2
| |
* | Merge branch 'dz-fix-spinach-mr' into 'master' Dmitriy Zaporozhets2016-10-171-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix randomly crashing spinach test for merge request For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6932
| * | Fix randomly crashing spinach test for merge requestDmitriy Zaporozhets2016-10-171-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-spinach-atom-feed-failure-due-to-carriage-returns' into ↵Dmitriy Zaporozhets2016-10-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix atom feed spinach failure ## What does this MR do? Replaces all carriage returns in the expected commit description. Is a partial fix to... > spinach 5 10 https://gitlab.com/gitlab-org/gitlab-ce/builds/5132637 - partial fix in !6910 As you can see, the other half of the fix to this build is in !6910. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Failed spinach tests ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6922
| * | | [Great spinach fix] Replace gsub with deleteValery Sizov2016-10-171-1/+1
| | | |
| * | | Remove carriage returns from commit description as summary is on a newline ↵Luke Bennett2016-10-171-1/+1
| |/ / | | | | | | | | | and will always include carriage returns
* | | Merge branch 'add-pipeline-metrics-worker' into 'master' Kamil Trzciński2016-10-175-22/+92
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Pipeline metrics worker ## What does this MR do? Creating a new Merge Request metrics is time consuming, because we need to access repository. This makes this operation asynchronous, thus non-blocking for updating pipeline. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6896
| * | 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 'ebraminio/gitlab-ce-master' into 'master'Robert Speicher2016-10-178-9/+46
|\ \ \ | |_|/ |/| | | | | | | | | | | Add RTL support to Markdown rendering See merge request !6296
| * | Add RTL support to markdown rendererEbrahim Byagowi2016-10-168-9/+46
| | |
* | | Merge branch 'fix-trending-projects-spinach-failure' into 'master' Dmitriy Zaporozhets2016-10-172-0/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | Fix trending projects Spinach failure The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list. Partial fix to #23378 See merge request !6911
| * | Fix trending projects Spinach failurefix-trending-projects-spinach-failureStan Hu2016-10-142-0/+5
| | | | | | | | | | | | | | | | | | | | | The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list. Partial fix to #23378
* | | 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.