- 17 Oct, 2016 14 commits
-
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
This reverts commit c5e0305d.
-
Lin Jen-Shin authored
This reverts commit 1404aa86.
-
Lin Jen-Shin authored
-
Lin Jen-Shin authored
* upstream/master: (148 commits) Fix broken rspec in compare text Added logic to handle a revision input that does not exist in the menu Fix broken Spinach tests caused by changes in !6550 Convert CHANGELOG to Markdown Fix active tab test for branches page Fix merge requests feature tests Wait for ajax call in merge request unsubscribe test Fix 500 error when creating mileston from group page Fix 404 when group path has dot in the name Add the tech writers usernames in the doc_sytleguide doc Fix broken SCSS linter errors due to missing newlines Fix Hash syntax to work for both Ruby 2.1 and 2.3 Fix Spinach merge request diff failures remove ashley since she no longer works here Revert "Improve tabbing usability for sign in page" Don't use member properties in users_spec, and remove loading ref. Clean up stray Sign up ref. Back off the array spreading, bc poltergeist freaks out. Convert dispatcher to es6. Add exists to users routes and fix endpoint. ...
-
Stan Hu authored
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
-
Stan Hu authored
!6910 changed the filter text from "Filter by branch/tag" to "Filter by Git revision"
-
Stan Hu authored
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
-
Luke Bennett authored
-
Stan Hu authored
Partial fix to #23378
-
- 16 Oct, 2016 20 commits
-
-
Dmitriy Zaporozhets authored
Fix active tab test for branches page For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6923
-
Dmitriy Zaporozhets authored
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
-
Robert Speicher authored
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
-
Robert Speicher authored
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
-
Achilleas Pipinellis authored
Add the tech writers usernames in the doc_sytleguide doc See merge request !6924
-
Achilleas Pipinellis authored
# Conflicts: # doc/development/doc_styleguide.md
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Fix 500 error when creating mileston from group page Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6920
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Fix 404 when group path has dot in the name Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23401 See merge request !6919
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Achilleas Pipinellis authored
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
-
Achilleas Pipinellis authored
[ci skip]
-
Achilleas Pipinellis authored
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
-
Stan Hu authored
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
-
Stan Hu authored
Fix broken SCSS linter errors due to missing newlines See merge request !6918
-
Stan Hu authored
-
Stan Hu authored
-
- 15 Oct, 2016 6 commits
-
-
-
Dmitriy Zaporozhets authored
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
-
Dmitriy Zaporozhets authored
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
-
Jacob Schatz authored
-
Stan Hu authored
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