Age | Commit message (Collapse) | Author | |
---|---|---|---|
2016-10-16 | Convert CHANGELOG to Markdown | Robert Speicher | |
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 | |||
2016-10-16 | Merge branch 'docs/change-docs-reviewers' into 'master' | Achilleas Pipinellis | |
Add the tech writers usernames in the doc_sytleguide doc See merge request !6924 | |||
2016-10-16 | Merge branch 'master' into 'docs/change-docs-reviewers' | Achilleas Pipinellis | |
# Conflicts: # doc/development/doc_styleguide.md | |||
2016-10-16 | Merge branch 'dz-fix-group-milestone-creation' into 'master' | Dmitriy Zaporozhets | |
Fix 500 error when creating mileston from group page Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23378 See merge request !6920 | |||
2016-10-16 | Fix 500 error when creating mileston from group page | Dmitriy Zaporozhets | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||
2016-10-16 | Merge branch 'dz-fix-group-with-dot' into 'master' | Dmitriy Zaporozhets | |
Fix 404 when group path has dot in the name Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23401 See merge request !6919 | |||
2016-10-16 | Fix 404 when group path has dot in the name | Dmitriy Zaporozhets | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||
2016-10-16 | Merge branch '23353-add-bookclub-to-university' into 'master' | Achilleas Pipinellis | |
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 | |||
2016-10-16 | Add the tech writers usernames in the doc_sytleguide doc | Achilleas Pipinellis | |
[ci skip] | |||
2016-10-16 | Merge branch 'clarify-cache-and-artifact-paths' into 'master' | Achilleas Pipinellis | |
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 | |||
2016-10-16 | Merge branch 'sh-fix-ruby-2-1' into 'master' | Stan Hu | |
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 | |||
2016-10-16 | Merge branch 'fix-broken-scss-lint' into 'master' | Stan Hu | |
Fix broken SCSS linter errors due to missing newlines See merge request !6918 | |||
2016-10-16 | Fix broken SCSS linter errors due to missing newlines | Stan Hu | |
2016-10-16 | Fix Hash syntax to work for both Ruby 2.1 and 2.3 | Stan Hu | |
2016-10-15 | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce | Jacob Schatz | |
2016-10-15 | Merge branch 'dz-handle-unmatched-routes' into 'master' | Dmitriy Zaporozhets | |
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 | |||
2016-10-15 | Merge branch 'dz-fix-extract-path' into 'master' | Dmitriy Zaporozhets | |
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 | |||
2016-10-15 | Merge branch 'master' into login-ui-improvements | Jacob Schatz | |
2016-10-15 | Merge branch 'remove-ashley' into 'master' | Stan Hu | |
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 | |||
2016-10-15 | Merge branch 'fix-language-spinach-failure' into 'master' | Robert Speicher | |
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 | |||
2016-10-15 | remove ashley since she no longer works here | De Wet Blomerus | |
2016-10-15 | Revert "Improve tabbing usability for sign in page" | Bryce Johnson | |
This reverts commit 8751491b8db471dc661daa19bc82a9dbd58e4aae. | |||
2016-10-15 | Don't use member properties in users_spec, and remove loading ref. | Bryce Johnson | |
2016-10-15 | Clean up stray Sign up ref. | Bryce Johnson | |
2016-10-15 | Back off the array spreading, bc poltergeist freaks out. | Bryce Johnson | |
2016-10-15 | Convert dispatcher to es6. | Bryce Johnson | |
2016-10-15 | Add exists to users routes and fix endpoint. | Bryce Johnson | |
2016-10-15 | Attempt to fix username validation ruby. | Bryce Johnson | |
2016-10-15 | Clean up layouts/devise.html. | Bryce Johnson | |
2016-10-15 | Use Ruby 1.9 syntax in tab_single def and usage. | Bryce Johnson | |
2016-10-15 | Fixup invalid refs. | Bryce Johnson | |
2016-10-15 | Convert field error NodeList to an Array. | Bryce Johnson | |
2016-10-15 | Revert conflict resolution in routes.rb. | Bryce Johnson | |
2016-10-15 | Use native dom in dispatcher field error init. | Bryce Johnson | |
2016-10-15 | Improve method naming in gl_field_errors. | Bryce Johnson | |
2016-10-15 | Stringify username before passing to ActiveRecord. | Bryce Johnson | |
2016-10-15 | Add accessor for current val for convenience. | Bryce Johnson | |
2016-10-15 | Safely scope siblings of validated input. | Bryce Johnson | |
2016-10-15 | Remove superfluous comment. | Bryce Johnson | |
2016-10-15 | Prevent unneccessary loading of UsernameValidator. | Bryce Johnson | |
2016-10-15 | Update filled in field for two_factor auth to use id. | Bryce Johnson | |
2016-10-15 | Fix syntax error -- missing comma in _new_crowd. | Bryce Johnson | |
2016-10-15 | Fix nesting on sessions/new. | Bryce Johnson | |
2016-10-15 | Click first Sign In in login_helper. | Bryce Johnson | |
2016-10-15 | Unbreak all the tests relying on one login-box. | Bryce Johnson | |
2016-10-15 | Add tests for gl_field_errors. | Bryce Johnson | |
2016-10-15 | Properly implement focus on first invalid. | Bryce Johnson | |
2016-10-15 | Fix omniauth box styling. | Bryce Johnson | |
2016-10-15 | Shush rubocop. | Bryce Johnson | |
2016-10-15 | Add third box shadow to validation focus, for depth. | Bryce Johnson | |