summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added GLTableDropdown to flip dropdowns if they overflow20052-manual-actions-dropdown-on-pipelines-makes-to-show-a-vertical-scrollbarLuke Bennett2016-09-293-2/+46
| | | | | | | | Added test Review changes and renamed to GLOverflowDropdown as it wont be used only on tables Changed window onload for dropdown onclick
* 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
| * Bump ruby prof to 0.16Elan Ruusamäe2016-09-283-3/+4
|/ | | | | | | This solve issues with ruby builds with rubygems preload see https://github.com/ruby-prof/ruby-prof/pull/191 Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master' Jacob Schatz2016-09-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed to v-cloak attr to hash rocket and string 'true' ## What does this MR do? Changed to v-cloak attr to hash rocket and string 'true' ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Maybe it's killing `master`? :confused: ## 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 !6553
| * Remove test for Ruby 2.1.Jacob Schatz2016-09-271-2/+2
| |
| * Run Ruby 2.1 tests on non-master branches too.is-v-cloak-causing-master-to-fail-pls-no-whyConnor Shea2016-09-271-2/+2
| |
| * Changed to hash rocket and string 'true'Luke Bennett2016-09-271-1/+1
|/
* Merge branch 'label-update-check-new' into 'master' Jacob Schatz2016-09-274-8/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send ajax request for label update only if they are changed ## What does this MR do? At the moment we send requests to update the labels on issue even if nothing has been changed. This fixes that and only sends requests when something has actually been changed. The code gets the initial selected values based on the inputs & then compares that to the selected values when submitting. If they are equal, then no request is sent. ## What are the relevant issue numbers? Closes #19472 See merge request !5071
| * Send ajax request for label update only if they are changed (#19472 !5071)label-update-check-newPhil Hughes2016-09-274-8/+35
| |
* | Merge branch 'fix/optimize-github-importer-for-speed-and-memory' into 'master' Yorick Peterse2016-09-275-78/+87
|\ \ | | | | | | | | | | | | Optimize GitHub importer for speed and memory See merge request !6552
| * | Call after_remove_branch only once after importing all GitHub PRsfix/optimize-github-importer-for-speed-and-memoryAhmad Sherif2016-09-272-2/+3
| | |
| * | Import all GitHub comments after importing issues and PRsAhmad Sherif2016-09-272-12/+17
| | |
| * | Speed up label-applying process for GitHub importingAhmad Sherif2016-09-272-14/+15
| | | | | | | | | | | | | | | | | | | | | * No need to re-fetch issues from GH to read their labels, the labels are already there from the index request. * No need to look up labels on the database for every application, so we cache them.
| * | Process each page of GitHub resources instead of concating them then processingAhmad Sherif2016-09-273-56/+58
| | | | | | | | | | | | | | | This should avoid having large memory growth when importing GitHub repos with lots of resources.
* | | Merge branch '22472-wrong-table-head' into 'master' Fatih Acet2016-09-271-7/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines table headers ## What does this MR do? Removed stages loop for a single 'Stages' header. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The headers were messing the table up. Note the redundant headers and squished cells. ![Screen_Shot_2016-09-27_at_14.40.51](/uploads/331b08c30a4af59cefc460ab4f3c2a61/Screen_Shot_2016-09-27_at_14.40.51.png) ## Screenshots (if relevant) ![Screen_Shot_2016-09-27_at_14.39.04](/uploads/687895e9152d4fe8d8f3bfc1233af39b/Screen_Shot_2016-09-27_at_14.39.04.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 #22472 See merge request !6542
| * | | Removed stages loop for a single 'Stages' header22472-wrong-table-headLuke Bennett2016-09-271-7/+1
| | | |
* | | | Merge branch 'includes-projects-to-render-issue-notes' into 'master' Yorick Peterse2016-09-272-1/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix IssuesController#show degradation including project on loaded notes See merge request !6540
| * | | Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notesPaco Guzman2016-09-272-1/+2
| | |/ | |/|
* | | Merge branch 'add-calendar-tests' into 'master' Jacob Schatz2016-09-272-9/+101
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more tests for calendar contribution ## What does this MR do? Add more tests for calendar contribution ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improve test coverage for calendar ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 #22347 See merge request !6421
| * | | Add more tests for calendar contributionClement Ho2016-09-262-9/+101
| | | |
* | | | Merge branch '22053-bump-gitlab-shell-to-have-git-trace' into 'master' Rémy Coutable2016-09-272-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-shell v3.6.2 ## What does this MR do? Bump gitlab-shell to v3.6.2 to be able to enable GIT_TRACE_PERFORMANCE output to a log file Relates #22053 See merge request !6367
| * | | | Use gitlab-shell v3.6.2 (GIT TRACE logging)22053-bump-gitlab-shell-to-have-git-tracePaco Guzman2016-09-262-1/+2
| | | | |
* | | | | Merge branch 'be-nice-to-docker-client' into 'master' Rémy Coutable2016-09-274-9/+28
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be nice to Docker Clients talking to JWT/auth ## What does this MR do? Makes all errors returned by JWT endpoint to be docker-compatible. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22465 See merge request !6536
| * | | | Be nice to Docker Clients talking to JWT/authKamil Trzcinski2016-09-274-9/+28
|/ / / /
* | | | Merge branch 'issue-boards-label-filter-fix' into 'master' Fatih Acet2016-09-273-3/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue board label filtering not removing labels ## What does this MR do? When trying to remove a label filter it would actually add it instead making it impossible to remove the label filter without modifying the URL. This fixes that by correctly removing the label from the filter. ## What are the relevant issue numbers? Closes #21417 See merge request !6208
| * | | | Tests fixissue-boards-label-filter-fixPhil Hughes2016-09-071-0/+2
| | | | |
| * | | | tests updatePhil Hughes2016-09-071-0/+2
| | | | |
| * | | | Fixed issue board label filtering not removing labelsPhil Hughes2016-09-073-3/+23
| | | | | | | | | | | | | | | | | | | | Closes #21417
* | | | | Merge branch 'fix/import-new-models-error' into 'master' Rémy Coutable2016-09-275-5/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Import/Export milestone and 1to1 models issue Fix 1to1 relations on project failing to be importing and milestone ordering issue. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22585 See merge request !6521
| * | | | | fix model order in import/export config and 1to1 relation issue. Added ↵James Lopez2016-09-275-5/+54
|/ / / / / | | | | | | | | | | | | | | | relevant specs.
* | | | | Merge branch 'rs-merge_commit_message' into 'master' doc-setup-sshRobert Speicher2016-09-272-7/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve how MergeCommit#merge_commit_message builds the message Now a merge request with a blank description will no longer produce a merge commit message like this: ``` Merge branch 'foo' into 'master' Bring the wonders of foo into the world See merge request !7283 ``` What an improvement! :tada: See merge request !6450
| * | | | | Improve how MergeCommit#merge_commit_message builds the messageRobert Speicher2016-09-272-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now a merge request with a blank description will no longer produce a merge commit message like this: ``` Merge branch 'foo' into 'master' Bring the wonders of foo into the world See merge request !7283 ``` What an improvement! :tada:
* | | | | | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-2711-7/+49
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add organization field to the user profile ## What does this MR do? Add organization field to the user profile ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So we can let users fill organization information separately ## Screenshots (if relevant) ![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21903 See merge request !6526
| * | | | | Add extra check for api users specDmitriy Zaporozhets2016-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Improvements to user organization field feature after code reviewDmitriy Zaporozhets2016-09-272-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add newline to user organization spec according to test guide * Remove unnecessary comments from user organization database migration Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add User#organization to users apiDmitriy Zaporozhets2016-09-274-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Dispaly organization name at user pageDmitriy Zaporozhets2016-09-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add organization field to user profileDmitriy Zaporozhets2016-09-276-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-275-13/+131
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `Members::ApproveAccessRequestService` Part of #21979. ## Does this MR meet the acceptance criteria? - [x] API support added - Tests - [x] Added for this feature/bug - [x] 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) - [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 !6266
| * | | | | Inverse condition in Members::ApproveAccessRequestServicerc-new-members-approve-request-access-serviceRémy Coutable2016-09-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status