summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix changelog...fix/import-event-errorJames Lopez2016-07-111-5/+3
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-07-11613-4819/+13622
|\ | | | | | | fix/import-event-error
| * Merge branch 'remove-not-released-status' into 'master' Robert Speicher2016-07-111-1/+1
| |\ | | | | | | | | | | | | | | | | | | Remove "not released" status from documentation [ci skip] See merge request !5024
| | * Remove not released statusMax Raab2016-06-301-1/+1
| | |
| * | Merge branch 'dz-sidebar-shadow' into 'master' Dmitriy Zaporozhets2016-07-111-0/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add side shadow for unpinned sidebar See merge request !5167
| | * | Refactor box-shadow style for sidebar to satisfy css lintdz-sidebar-shadowDmitriy Zaporozhets2016-07-111-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Add side shadow for unpinned sidebarDmitriy Zaporozhets2016-07-091-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'dz-today-issue-color' into 'master' Dmitriy Zaporozhets2016-07-111-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make color that highligh today issues more lightweight See merge request !5168
| | * | | Lower case todya issue colorsdz-today-issue-colorDmitriy Zaporozhets2016-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Make color that highligh today issues more lightweightDmitriy Zaporozhets2016-07-091-2/+2
| | |/ / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'fix-type-in-project-factory' into 'master' Rémy Coutable2016-07-111-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in factory for projects.rb ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? ## 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 [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5100
| | * | | Fix typo in factory for projects.rbYatish Mehta2016-07-051-1/+1
| | | | |
| * | | | Merge branch 'sshkey-ux' into 'master' Rémy Coutable2016-07-112-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reminder to not paste private SSH keys ## What does this MR do? Just got the "How would you make GitLab better?" mail and thought that I could follow it. This commit adds a short reminder to not paste the private part of an SSH key to the form where one can add SSH keys to one's account. I think that's an useful message, both for people who aren't that experienced yet and for people who are sleep-deprived. :-) I decided to just list the most common key type, `ssh-rsa`. The full list of key types in the [CVS repository of OpenSSH](http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/usr.bin/ssh/sshkey.c?rev=HEAD&content-type=text/plain) contains some types which I'd regard as a bit obscure. Mentioning all of those types would probably clutter the form too much. We could think about whether to list what is probably the second most common key type, namely `ssh-dss`. But note that this key type [seems to be deprecated](https://security.stackexchange.com/questions/5096/rsa-vs-dsa-for-ssh-authentication-keys). ## Are there points in the code the reviewer needs to double check? I didn't actually test this one-line change. ## Why was this MR needed? It's not, strictly speaking, needed, but could be considered a nice addition. See merge request !4399
| | * | | | Add changelog entry for !4399Ingo Blechschmidt2016-07-091-0/+1
| | | | | |
| | * | | | Add reminder to not paste private SSH keysIngo Blechschmidt2016-07-091-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'fix/remove-import-url-migration' into 'master' Rémy Coutable2016-07-113-106/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove slow migration and add fix to sanitize errors Getting rid of the slow migration and preventing the Error to occur Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19608 See merge request !5176
| | * | | | spec and fix for sanitize methodJames Lopez2016-07-112-0/+8
| | | | | |
| | * | | | remove fix validatable import url migrationJames Lopez2016-07-111-106/+0
| | | | | |
| * | | | | Merge branch 'update-gemfile' into 'master' Rémy Coutable2016-07-110-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run bundle install and update Gemfile.lock !5078 didn't update the `Gemfile.lock` even though it added some restrictions on gem versions, this fixes that. cc: @rymai See merge request !5159
| | * | | | | Run bundle install.update-gemfileConnor Shea2016-07-081-15/+15
| | | | | | |
| * | | | | | Merge branch 'compare-avatar-alignment' into 'master' Robert Speicher2016-07-101-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit avatar alignment in compare view Closes #19567 See merge request !5128
| | * | | | | | Fixed commit avatar alignment in compare viewcompare-avatar-alignmentPhil Hughes2016-07-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #19567
| * | | | | | | Merge branch 'blockquote-fence-filter' into 'master' Robert Speicher2016-07-107-2/+367
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add blockquote fence syntax to Markdown Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/16564 Before Markdown rendering happens, this will transform this: ``` Let me quote this here email: >>> Dear friend, How are you? Greetings, Me >>> ``` Into this, saving me from having to prefix all of those lines with `>` manually when I copy some multiline text from another medium: ``` Let me quote this here email: > Dear friend, > > How are you? > > Greetings, > > Me ``` See merge request !3954
| | * | | | | | | Fix typo in specDouwe Maan2016-07-101-1/+1
| | | | | | | | |
| | * | | | | | | Add more comments to regexDouwe Maan2016-07-103-13/+34
| | | | | | | | |
| | * | | | | | | Add changelog itemDouwe Maan2016-07-091-0/+1
| | | | | | | | |
| | * | | | | | | Add blockquote fence syntax to MarkdownDouwe Maan2016-07-096-2/+345
| | | | | | | | |
| * | | | | | | | Merge branch 'rs-gemfile-lock' into 'master' Robert Speicher2016-07-101-15/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gemfile.lock after versions were added in !5078 See merge request !5171
| | * | | | | | | | Update Gemfile.lock after versions were added in !5078Robert Speicher2016-07-101-15/+15
| | |/ / / / / / /
| * | | | | | | | Merge branch 'bump-omniauth-google-oauth2' into 'master' Robert Speicher2016-07-102-3/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump google-omniauth-oauth2 to 0.4.1 Closes #19064 See merge request !4882
| | * | | | | | | | bump google-omniauth-oauth2 to 0.4.1Pirate Praveen2016-06-232-3/+3
| | | | | | | | | |
| * | | | | | | | | Merge branch 'reuse-queries-in-reference-parsers' into 'master' Robert Speicher2016-07-104-4/+113
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use queries in reference parsers This MR changes the reference parsing pipeline to cache queried objects and re-use them on subsequent runs. Data is cached in the `RequestStore` module so it's automatically flushed after a request. Certain references are processed multiple times. For example, for every system note we check if it's a cross reference by getting the issues, MRs and commits it references. When redacting data we may end up querying these very same objects. By caching this we can quite drastically reduce timings and SQL query counts. #15607 See merge request !5020
| | * | | | | | | | Re-use queries in reference parsersreuse-queries-in-reference-parsersYorick Peterse2016-07-084-4/+113
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caches various queries to ensure that multiple reference extraction runs re-use any objects queried in previous runs.
| * | | | | | | | Merge branch 'api-docs-typos' into 'master' Achilleas Pipinellis2016-07-092-44/+51
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos in API documentation See merge request !4949
| | * | | | | | | | projects: add container_registry_enabled to API docsBen Boeckel2016-06-271-0/+7
| | | | | | | | | |
| | * | | | | | | | update_service: remove trailing whitespaceBen Boeckel2016-06-271-1/+1
| | | | | | | | | |
| | * | | | | | | | docs: fix some typosBen Boeckel2016-06-272-44/+44
| | | | | | | | | |
| * | | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-07-091-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix phpunit command in the docker example. Closes https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1478 See merge request !5147
| | * | | | | | | | | gitlab-org/gitlab-ci-multi-runner#1478 Fixed phpunit command in the official ↵kujiy2016-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc didn't work. Curl command has to follow redirects now.
| * | | | | | | | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-07-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong gitlab-shell version in 8.9-8.10 update guide See merge request !5153
| | * | | | | | | | | | Wrong gitlab-shell versionChristian Decker2016-07-081-1/+1
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'doc-custom-hooks' into 'master' Achilleas Pipinellis2016-07-091-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo and explain the precedence of STDERR and STDOUT ## What does this MR do? Addresses comments https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5088#note_12884564 See merge request !5169
| | * | | | | | | | | Fix typo and explain the precedence of STDERR and STDOUTAchilleas Pipinellis2016-07-091-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'dz-subnav-darker' into 'master' Dmitriy Zaporozhets2016-07-092-9/+7
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make subnavigation a bit darker color See merge request !5166
| | * | | | | | | | | | Make subnavigation a bit darker colorDmitriy Zaporozhets2016-07-092-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Merge branch 'dz-button-capitalize' into 'master' Dmitriy Zaporozhets2016-07-091-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ui_guide.md with button capitalize rule cc @jschatz1 @hazelyang @skyruler See merge request !5161
| | * | | | | | | | | | Update ui_guide.md with button capitalize ruledz-button-capitalizeDmitriy Zaporozhets2016-07-081-1/+2
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'new-snippet-button-permissions' into 'master' Fatih Acet2016-07-085-44/+47
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update New Snippet buttons. ## What does this MR do? No longer shows New Snippet button to users who aren't able to create a new snippet in the given context. Also removes the plus icon from the New Snippet buttons, as they're no longer used in other creation buttons. ## Are there points in the code the reviewer needs to double check? Make sure the snippets pages don't break or show the buttons to users who shouldn't have access to them. ## Why was this MR needed? Users that weren't logged in would click the New Snippet button and get a 404 error. You would also get 404 errors from the New Snippet button on project snippets for projects you weren't able to create snippets for. ## What are the relevant issue numbers? Fixes #14595. ## Screenshots (if relevant) Before: ![before1](/uploads/2c222cd981332d30772054cefadafa28/before1.png) ![before2](/uploads/2734f8a84ae293b08dd982f2ed7da028/before2.png) After: ![after1](/uploads/c84aa9aec17056095271b0f24c6e9b5b/after1.png) ![after2](/uploads/70fe37ad7be5054bf20439ca0a1f5ccc/after2.png) ![after3](/uploads/afcd435c211482e9df25cb8971f1e65e/after3.png) ![after4](/uploads/9eab87440aae4991b508373ff36e3c7a/after4.png) ![after5](/uploads/f5ec167cb3e1115d3b3a43bd5231bc60/after5.png) ![after6](/uploads/c774cbb1f9babe3382ff69af7060b9c5/after6.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4998
| | * | | | | | | | | | Use btn-danger for delete button.Connor Shea2016-07-081-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Update New Snippet buttons.Connor Shea2016-07-085-43/+46
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No longer shows New Snippet button to users who aren't able to create a new snippet in the given context. Also removes the plus icon from the New Snippet buttons, as they're no longer used in other creation buttons. Fixes #14595.