- 29 Sep, 2016 13 commits
-
-
Mike Greiling authored
-
Mike Greiling authored
-
Robert Speicher authored
Remove duplicate VersionInfo class This was brought over during the CI merge and already exists at `lib/gitlab/version_info.rb`. See merge request !6586
-
Rémy Coutable authored
Add '.well-known' to the list of reserved namespaces See https://gitlab.com/gitlab-org/gitlab-ce/issues/22759 See merge request !6585
-
Robert Speicher authored
This was brought over during the CI merge and already exists at `lib/gitlab/version_info.rb`.
-
Rémy Coutable authored
Expose pipeline data in builds API Exposes pipeline data in builds API, as suggested by #22367. The fields exposed were 'id', 'status', 'ref', and 'sha'. Closes #22367 See merge request !6502
-
-
Rémy Coutable authored
Remove Flog This MR removes the flog gem and its associated rake task as we use the ABC Metrics Rubocop to accomplish the same thing. There's not really any reason to have it anymore. The rest of this MR is kept for posterity and is no longer relevant. ------- After a few months of flog/flay failing silently - and now a week of them failing loudly - I think it's safe to say we don't care enough about flog/flay for them to be worth keeping. If you'd like to keep them around, speak now or forever hold your peace :) See also #17858. See merge request !6554
-
Stan Hu authored
Update warn message for MySQL fix ZD: https://gitlab.zendesk.com/agent/tickets/39529 The current warn message is ambiguous. We should mention MySQL. See merge request !6582
-
Guilherme Salazar authored
add pipeline ref, sha, and status to the build API response add tests of build API (pipeline data) change API documentation for builds API log change to builds API in CHANGELOG CHANGELOG: add reference to pull request and contributor's name
-
Connor Shea authored
-
Jacob Schatz authored
Revert "Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' into 'master'" ## What does this MR do? ## 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 you do - 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 !6583
-
Jacob Schatz authored
This reverts merge request !6188
-
- 28 Sep, 2016 27 commits
-
-
Chris Wilson authored
-
Robert Speicher authored
Merge branch '22352-cannot-install-gitlab-shell-on-ubuntu-server-with-no-previous-gitlab-install' into 'master' Correct gitlab-shell installation instructions in docs ## Why was this MR needed? With the introduction of repository storages validations it becomes necessary to add the flag `SKIP_STORAGE_VALIDATION` to the gitlab-shell install command, since that command will create the storage paths ## What are the relevant issue numbers? Closes #22352 [ci skip] See merge request !6579
-
Alejandro Rodríguez authored
With the introduction of repository storages validations it becomes necessary to add the flag `SKIP_STORAGE_VALIDATION` to the gitlab-shell install command, since that command will create the storage paths
-
Fatih Acet authored
Add Pipelines for Commit ## What does this MR do? This adds a Pipelines for Commit. I used existing view that we use to show pipelines. However, this is completely ugly with a lot of redundancy. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-09-13_at_13.43.38](/uploads/0ac6e7d4825e32dba7ff7ab051da837c/Screen_Shot_2016-09-13_at_13.43.38.png) ## 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 you do - 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? Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/18937 See merge request !6322
-
Douwe Maan authored
Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called ## What does this MR do? Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called, instead return the saved token if one is present. This was causing a lot of 401s, leading to 403s, as state in #22527 As it turns out, when pushing a lot of LFS objects, the LFS client was calling `git-lfs-authenticate` in the middle of the request again. This caused the `lfs_token` to be regenerated. The problem lies in that the LFS client was not aware of this change, and was still using the old token. This caused all subsequent requests to fail with a 401 error. Since HTTP Auth is protected by Rack Attack, this 401s where immediately flagged and resulted in the IP of the user being banned. With this change, GitLab returns the value stored in Redis, if one is present, thus if the LFS client calls `git-lfs-authenticate` again during the request, the auth header will remain unchanged, allowing all subsequent requests to continue without issues. ## What are the relevant issue numbers? Fixes #22527 cc @SeanPackham @jacobvosmaer-gitlab See merge request !6551
-
Patricio Cano authored
Reset expiry time of token, if token is retrieved again before it expires.
-
Douwe Maan authored
Merge branch '22592-can-set-due-date-through-slash-commands-even-though-i-m-not-authorized-to' into 'master' Fix permission for setting an issue's due date ## What does this MR do? This merge request ensure the current user can `:admin_issue` in order to change the issue's `due_date`, in `BaseIssuableService` and in `SlashCommands::InterpretService`. Closes #22592 ## Are there points in the code the reviewer needs to double check? No. ## 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 - [ ] All builds are passing - [x] 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) - [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 !6539
-
Achilleas Pipinellis authored
Fix typo `CSFR` -> `CSRF` in the OAuth2 doc See merge request !6538
-
Fatih Acet authored
Added soft wrap option to editor ## What does this MR do? Adds a `Soft wrap` button to the editor, when clicked, it wraps the text in the editor and changes to `No wrap`, then when clicked, it unwraps the text in the editor. This will also detect files with no extension, `.txt` or `.md` and proactively set the soft wrap. **Unless**, you explicitly toggle the soft wrap, then it will stop checking the file path and will stay with the users explicit preference. ## Are there points in the code the reviewer needs to double check? We should talk about the `.txt` and `.md` thing, [I'm not sure if its a good approach](https://gitlab.com/gitlab-org/gitlab-ce/issues/18297#note_14918218). ## Why was this MR needed? ## Screenshots (if relevant) https://youtu.be/8LW5nQsraSM #### No wrap ![Screen_Shot_2016-09-02_at_19.54.54](/uploads/97f2d1b2d415d03fe1b0be0640ab12e0/Screen_Shot_2016-09-02_at_19.54.54.png) #### Soft wrap ![Screen_Shot_2016-09-02_at_19.54.45](/uploads/5af425587ce7198e015cce58440971b9/Screen_Shot_2016-09-02_at_19.54.45.png) ## 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 you do - 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? Closes #18297 See merge request !6188
-
Fatih Acet authored
-
Luke Bennett authored
-
Luke Bennett authored
Added tests Added awesomeeeeee icons
-
Rémy Coutable authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Fix duplicate master entries in the mr versions dropdown ## What does this MR do? Fixes bug when "master" was duplicated per each mr version in the dropdown Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22519, Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22715 See merge request !6567
-
Douwe Maan authored
Reduce duplication in `Gitlab::Diff::PositionTracer` ## What does this MR do? This factorize similar code from `Gitlab::Diff::PositionTracer` ## Are there points in the code the reviewer needs to double check? The code might be harder to understand now... ## Why was this MR needed? To get rid of flay offense. ## Does this MR meet the acceptance criteria? - Tests - [x] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22202 See merge request !6365
-
Yorick Peterse authored
AbstractReferenceFilter caches current project_ref on RequestStore when active See merge request !6545
-
Paco Guzman authored
Before we weren’t caching current_project_ref because normally the reference to the current project doesn’t include the path with namespace. But now we store the current project in the projects reference cache to be used for the same filter when accessing using path with namespace of for subsequent filters executed on the cache.
-
Dmitriy Zaporozhets authored
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Achilleas Pipinellis authored
Add university content ## What does this MR do? Imports gitlab-org/University content into doc/university to deprecate university.gitlab.com and access it from doc.gitlab.com/universtiy. ## Are there points in the code the reviewer needs to double check? That there are no broken links. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added ## What are the relevant issue numbers? #22449 See merge request !6520
-
Yorick Peterse authored
"Banzai::ReferenceParser::BaseParser is executing queries that don't return results" See merge request !6546
-
Rémy Coutable authored
Add footnote to Markdown docs _Originally opened at !3741 by @bbodenmiller._ - - - See merge request !6564
-
Ben Bodenmiller authored
Signed-off-by:
Rémy Coutable <remy@rymai.me>
-
Robert Speicher authored
Reduce output to the build log Remove a log of useless info from the build log by adding `--quiet` flag. [Bundler docs](https://bundler.io/v1.2/bundle_install.html) See merge request !6560
-
Sean Packham authored
-
Rémy Coutable authored
Added git http requests tests for user with LDAP identity ## What does this MR do? Added tests to git http request for a user with ldap identity. ## Are there points in the code the reviewer needs to double check? In order to stick to the way the existing tests are defined in spec files, I have added the new tests in the same spec file that coveres the git http request feature and thus it seems to be a lot of changes in the git_http_spec.rb when looking at the commit git in Gitlab, but the largest change is indentation so please check with a better diff tool (i.e. kdiff3). Let me know if this is OK with you or do you want to have a new file introduced (i.e. `git_http_ldap_spec.rb`) ## Why was this MR needed? To increase test coverage and to make sure the changes that will be introduced by #20820 will not introduce any regressions. ## What are the relevant issue numbers? #20820 See merge request !6559
-
Z.J. van de Weg authored
-