- 20 Jul, 2016 9 commits
-
-
Ruben Davila authored
-
Dmitriy Zaporozhets authored
Performance improvement of push rules We don't need to check temp ref anymore since https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/563 is merged related https://gitlab.com/gitlab-org/gitlab-ce/issues/14280#note_13198239 See merge request !578
-
Valery Sizov authored
-
Stan Hu authored
[Elastic] Suppress ActiveRecord::RecordNotFound error in ElasticIndexWorker Fixes https://gitlab.com/gitlab-com/infrastructure/issues/233 See merge request !577
-
Valery Sizov authored
-
Valery Sizov authored
Fix Gemfile.lock It has been committed during CE->EE merge. Sorry See merge request !576
-
Jacob Vosmaer (GitLab) authored
Mention Kerberos in CHANGELOG-EE This was forgotten in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/548 See merge request !574
-
Valery Sizov authored
-
Jacob Vosmaer authored
-
- 19 Jul, 2016 31 commits
-
-
Douwe Maan authored
Fix bad Group class resolution when querying LDAP via API When querying LDAP groups via the API, there was a 500 error with a strange stack. Thanks to @DouweM we figured out that in the context of the API, it's choosing `::Group` instead of `EE::Gitlab::LDAP::Group`. This makes it just specific enough to work. See merge request !572
-
Robert Speicher authored
Improve error text for LDAP group links See merge request !573
-
Douwe Maan authored
Add ticket-based Kerberos sign-ins Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/745 This is meant as a replacement for omniauth-kerberos. This MR does not rip out or disable omniauth-kerberos, however, because that has the risk of locking out all Kerberos users on Kerberos-enabled GitLab server that does not have a service keytab yet. On GitLab installations that have a keytab, namely those which have 'git access via SPNEGO' enabled, this change will automatically enable ticket-based sign-ins. See merge request !548
-
Drew Blessing authored
-
Rémy Coutable authored
Fix autoloading issue in test environment Always prefer to use the full class namespace when specifying a superclass inside a module, because autoloading can occur in a different order between execution environments. ```ruby module Foo class Base def initialize raise "This is the wrong super class!" end end end module Foo module Bar class Sample < Base # Inherits from ::Foo::Base because Foo::Bar::Base isn't defined yet end end end module Foo module Bar class Base def initialize puts "Success!" end end end end > Foo::Bar::Sample.new => RuntimeError: This is the wrong super class! ``` The trouble occurs when Rails has already autoloaded `Gitlab::SearchResults` and not `Gitlab::Elastic::SearchResults`. In this case, Rails will never need to autoload `Gitlab::Elastic::SearchResults` because `Gitlab::SearchResults` already matches the superclass. This is why this [build](https://gitlab.com/gitlab-org/gitlab-ee/builds/2464466) only fails when the spec run after `spec/lib/gitlab/search_results_spec.rb`. /cc @DouweM @rspeicher @vsizov See merge request !571
-
Drew Blessing authored
-
Douglas Barbosa Alexandre authored
Always prefer to use the full class namespace when specifying a superclass inside a module, because autoloading can occur in a different order between execution environments.
-
Valery Sizov authored
Uninitialized constant ElasticIndexerWorker::Client Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/772 See merge request !554
-
Valery Sizov authored
CE upstream See merge request !570
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
CE upstream @timothyandrew Please resolve: ``` spec/lib/gitlab/git_access_spec.rb lib/gitlab/checks/change_access.rb lib/gitlab/git_access.rb lib/gitlab/git_access_wiki.rb ``` See merge request !568
-
Rémy Coutable authored
Use value of `yaml_variables` and `when` from config_processor if undefined ## What does this MR do? Uses `yaml_variables` and `when` from config_processor if values for these are undefined. ## Why was this MR needed? Old builds doesn't have this columns initialised. Thus makes the retries on these builds to not work properly. This is regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5296. ## Does this MR meet the acceptance criteria? - 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) See merge request !5342
-
Fatih Acet authored
Added redirect_to_referer to login link on issues ## What does this MR do? Adds a `redirect_to_referer` param to login & register links on issues when not logged in. This makes the login box redirect back to the issue after login. ## What are the relevant issue numbers? Closes #19968 See merge request !5344
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Rémy Coutable authored
Add support for manual CI actions ## What does this MR do? This implements a `when: manual` which allows a jobs to be marked as manual actions. Manual actions have to be explicitly executed by developers. ## What are the relevant issue numbers? This is to solve: https://gitlab.com/gitlab-org/gitlab-ce/issues/17010 See merge request !5297
-
Rémy Coutable authored
Simplify entities for branches and tags API ## What does this MR do? As talked in !5208, I improved the entity for branches and tags. ## 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 !5343
-
Fatih Acet authored
Resolve "Add icons for branch and tag in pipeline list" ## What does this MR do? Adds branch or tag icon on pipeline ref ## What are the relevant issue numbers? Closes #19751 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-13_at_1.42.54_PM](/uploads/d90706a76cf87a6cc8c25dca9a71affa/Screen_Shot_2016-07-13_at_1.42.54_PM.png) With icons closer to tag/branch name/sha: ![Screen_Shot_2016-07-15_at_11.23.48_AM](/uploads/411338f811bafbd314dbab5553fa46d4/Screen_Shot_2016-07-15_at_11.23.48_AM.png) See merge request !5239
-
Kamil Trzcinski authored
-
Phil Hughes authored
-
Rémy Coutable authored
Added Rake task for tracking deployments ## What does this MR do? This MR adds a Rake task to track the current version of GitLab in InfluxDB. ## Are there points in the code the reviewer needs to double check? We may want to document this Rake task in some Markdown file, but I'm not sure what the best place for this would be. ## Why was this MR needed? We want to have a more accurate overview of when deployments occurred. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/infrastructure/issues/98 ## 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~~ - [x] 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) See merge request !5320
-
Phil Hughes authored
Closes #19968
-
Rémy Coutable authored
Api delete todos ## What does this MR do? It changes the `DELETE /todos` to only return the number of marked todos. ## Why was this MR needed? Before it returned the marked todos as an paginated array. Since we deleted/marked the todos, there was no way to get the rest of the todos. ## What are the relevant issue numbers? Closes #19678 ## 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 [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 !5341
-
Robert Schilling authored
-
Yorick Peterse authored
This simply inserts the current GitLab version in the "deployments" measurement. Fixes gitlab-com/infrastructure#98
-
Dmitriy Zaporozhets authored
Change color of today issue highlight See merge request !5329
-
Robert Schilling authored
-