summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update warn message for MySQL fixmrchrisw/mysql-connection-warnChris Wilson2016-09-281-1/+1
|
* Merge branch ↵Robert Speicher2016-09-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * [ci-skip] Correct gitlab-shell installation instructions in docs22352-cannot-install-gitlab-shell-on-ubuntu-server-with-no-previous-gitlab-installAlejandro Rodríguez2016-09-281-1/+1
|/ | | | | | 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
* Merge branch 'pipelines-for-commit' into 'master' Fatih Acet2016-09-2810-21/+39
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Rearranged commit tabs and changed commit `Commit` column header to `Pipeline`pipelines-for-commitLuke Bennett2016-09-273-6/+6
| | | | | | | | Changed `Commit` column header to `Pipeline` on pipeline index
| * Update CHANGELOGKamil Trzcinski2016-09-271-0/+1
| |
| * Commit status icon now links to pipelines tab of commit viewLuke Bennett2016-09-273-10/+13
| | | | | | | | | | | | Removed commit from pipeline list items Used local_assigns and changed to positive naming ffor boolean props
| * Add Pipelines for CommitKamil Trzcinski2016-09-275-9/+23
| |
* | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-287-21/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Handle LFS token creation and retrieval in the same method, and in the same ↵lfs-ssh-authorization-fixPatricio Cano2016-09-287-24/+21
| | | | | | | | | | | | | | | | | | Redis connection. Reset expiry time of token, if token is retrieved again before it expires.
| * | Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is ↵Patricio Cano2016-09-272-0/+29
| | | | | | | | | | | | called, instead return the saved token if one is present.
* | | Merge branch ↵Douwe Maan2016-09-289-66/+216
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | Fix permission for setting an issue's due dateRémy Coutable2016-09-289-66/+216
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'fix-csfr-typo-in-doc' into 'master' Achilleas Pipinellis2016-09-281-8/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo `CSFR` -> `CSRF` in the OAuth2 doc See merge request !6538
| * | | | Fix typo `CSFR` -> `CSRF` in the OAuth2 docfix-csfr-typo-in-docRémy Coutable2016-09-271-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '18297-i-would-like-text-to-wrap-when-in-edit-mode-on-web-app' ↵Fatih Acet2016-09-287-0/+117
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' 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
| * | | | Added CHANGELOG entry.Fatih Acet2016-09-282-0/+3
| | | | |
| * | | | Review changesLuke Bennett2016-09-286-41/+33
| | | | |
| * | | | Added soft wrap logic and button to editorLuke Bennett2016-09-287-2/+124
|/ / / / | | | | | | | | | | | | | | | | | | | | Added tests Added awesomeeeeee icons
* | | | Merge branch 'dz-improve-mr-versions' into 'master' Rémy Coutable2016-09-282-5/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add changelog for duplicate branch bug in mr version featuredz-improve-mr-versionsDmitriy Zaporozhets2016-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix duplicate master entries in the mr versions dropdownDmitriy Zaporozhets2016-09-281-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch '22202-reduce-duplication-in-gitlab-diff-position_tracer' into ↵Douwe Maan2016-09-281-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 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
| * | | | | Tell Flay to ignore Gitlab::Diff::PositionTracer22202-reduce-duplication-in-gitlab-diff-position_tracerRémy Coutable2016-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch '22679-avoid-abstract-reference-filter-project-requests' into ↵Yorick Peterse2016-09-283-5/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' AbstractReferenceFilter caches current project_ref on RequestStore when active See merge request !6545
| * | | | | | AbstractReferenceFilter caches current project_ref on RequestStore when active22679-avoid-abstract-reference-filter-project-requestsPaco Guzman2016-09-283-5/+22
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'add-university-content' into 'master' Achilleas Pipinellis2016-09-2823-0/+1648
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Resolve merge request commentsadd-university-contentSean Packham2016-09-281-5/+5
| | | | | |
| * | | | | Fix linksSean Packham2016-09-271-3/+3
| | | | | |
| * | | | | Resolve merge request commentsSean Packham2016-09-274-35/+27
| | | | | |
| * | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2712-27/+212
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Readded imagesSean Packham2016-09-2715-0/+0
| | | | | |
| * | | | | Removed lfsSean Packham2016-09-2716-46/+0
| | | | | |
| * | | | | Fix lint errorSean Packham2016-09-271-1/+1
| | | | | |
| * | | | | Migrate university to use lfs for imagesSean Packham2016-09-2716-0/+1
| | | | | |
| * | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2778-223/+575
| |\ \ \ \ \
| * | | | | | Added University contentSean Packham2016-09-261-0/+1
| | | | | | |
| * | | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2632-156/+384
| |\ \ \ \ \ \
| * | | | | | | Imported GitLab University contentseanpackham2016-09-2323-0/+1655
| | | | | | | |
* | | | | | | | Merge branch '22681-avoid-empty-queries-on-reference-parsers' into 'master' Yorick Peterse2016-09-282-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Banzai::ReferenceParser::BaseParser is executing queries that don't return results" See merge request !6546
| * | | | | | | | Avoid database queries on Banzai::ReferenceParser::BaseParser for nodes ↵22681-avoid-empty-queries-on-reference-parsersPaco Guzman2016-09-282-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without references
* | | | | | | | | Merge branch 'bbodenmiller/gitlab-ce-patch-2' into 'master' Rémy Coutable2016-09-281-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add footnote to Markdown docs _Originally opened at !3741 by @bbodenmiller._ - - - See merge request !6564
| * | | | | | | | | Add footnote to Markdown docsBen Bodenmiller2016-09-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'zj-bundle-quiet-mode' into 'master' Robert Speicher2016-09-281-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Reduce output to the build logzj-bundle-quiet-modeZ.J. van de Weg2016-09-281-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'hvlad/gitlab-ce-feature/add_test_for_git_http_ldap_user' into ↵Rémy Coutable2016-09-282-324/+381
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' 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
| * | | | | | | | | Added git http requests tests for user with LDAP identityHoratiu Eugen Vlad2016-09-282-324/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'siemens/gitlab-ce-fix/ldap-access-errors' into 'master' Rémy Coutable2016-09-285-5/+44
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log LDAP lookup errors and don't swallow unrelated exceptions - Previously all exceptions were ignored, now only `Net::LDAP::Error` and exceptions that inherit from it are caught by the `rescue` clause. There might be other exceptions that should also be ignored / dealt with. - Not sure if the Rails production log is a good choice for this, or if the GitLab application log would be more appropriate. See merge request !6558
| * | | | | | | | | Log LDAP lookup errors and don't swallow unrelated exceptionsMarkus Koller2016-09-285-5/+44
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roger Meier <r.meier@siemens.com>
* | | | | | | | | Merge branch 'glensc/gitlab-ce-ruby-prof-0.16' into 'master' Rémy Coutable2016-09-283-3/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bump ruby prof to 0.16 See merge request !6557
View Lorry Controller Status