- 07 Jun, 2016 32 commits
-
-
Robert Speicher authored
Merge CE 981829f3 into EE master This merges everything up to (and including) CE commit 981829f3 into EE. This was done mainly to have the update guides for CE also in EE along with any other changes since the last merge. See merge request !442
-
Kamil Trzcinski authored
-
Yorick Peterse authored
-
Yorick Peterse authored
Added 8.9 install/update guides See merge request !4507
-
Yorick Peterse authored
[ci skip]
-
Jacob Vosmaer (GitLab) authored
Workhorse to serve raw diffs Fixes (partially) #13999 Dependent on: gitlab-org/gitlab-workhorse!45 See merge request !4130
-
Douwe Maan authored
Rename ci_commit in application code This is third iteration of renaming `[ci_]commit(s)` in application code to `pipeline(s)`. See merge request !4464
-
Douwe Maan authored
Rename Ci::Commit in specs This is second iteration of renaming Ci::Commit occurences, this time I try to rename all `let's` and `factories` to match what type of object is created: 1. Rename factories: `ci_[...]_commit_[...]` to `ci_[...]_pipeline_[...]`, 2. Rename all `let's(:[ci_]commit)` to `let(:pipeline)`, 3. Rename all occurrences of `[ci_]commit` to `pipeline` if Pipeline object is created cc @grzesiek @DouweM See merge request !4463
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Valery Sizov authored
CE upstream See merge request !439
-
Yorick Peterse authored
See merge request gitlab-org/gitlab-ee!433 for more details.
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Kamil Trzcinski authored
-
Phil Hughes authored
-
Rémy Coutable authored
License finder gem Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license. https://github.com/pivotal/LicenseFinder See also: gitlab-com/operations#164 See merge request !3775
-
Valery Sizov authored
-
Valery Sizov authored
-
Valery Sizov authored
Fix schema I've pushed my local schema to EE master during CE->EE merge mistakenly. This MR reverts previous state See merge request !441
-
Valery Sizov authored
I've pushed my local schema to EE master during CE->EE mistakenly. This commit reverts previous state
-
Rémy Coutable authored
Fix missed colorize methods. Fix #18250. cc: @twk3 See merge request !4495
-
Timothy Andrew authored
- This was abstracted into the `AuthenticatesWithTwoFactor` module, but was probably resurrected during a merge.
-
Stan Hu authored
Clean up the `Projects::UpdateMirrorService` spec See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/434/diffs#note_12247544 See merge request !436
-
Stan Hu authored
Bump rouge to 1.11.0 See: https://github.com/jneen/rouge/blob/master/CHANGELOG.md See merge request !4491
-
Stan Hu authored
-
Robert Speicher authored
Allow LDAP to handle external users, based on users' group memberships Fixes gitlab-org/gitlab-ce#4009 These MR adds functionality to the `LdapGroupSync` feature that allows it to receive an array of group names, in order for the members of these groups to be marked as external users. See merge request !432
-
Robert Speicher authored
Use better_errors editor links in sherlock Closes #18254. Uses the same editor configuration of `better_errors` so that you don't have to configure things twice. Remember to have a custom initializer that specifies your editor. Example for atom. File `config/initializers/better_errors.rb`: ````ruby if defined?(BetterErrors) BetterErrors.editor = "atm://open?url=file://%{file}&line=%{line}" end ```` See merge request !4497
-
- 06 Jun, 2016 8 commits
-
-
Alejandro Rodríguez authored
Remember to configure your `better_errors` editor to point to your program of preference
-
Connor Shea authored
-
Jacob Schatz authored
Add padding to bottom of wiki page, fix #12921. ## What does this MR do? Adds padding to the bottom of the wiki page so it's not right up against the edge of the browser window. ## What are the relevant issue numbers? #12921 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-06_at_12.21.22_PM](/uploads/9710682a57f5e521253f17a65f896f4d/Screen_Shot_2016-06-06_at_12.21.22_PM.png) After: ![Screen_Shot_2016-06-06_at_12.20.50_PM](/uploads/002068b072050e0f8146757a0386d30f/Screen_Shot_2016-06-06_at_12.20.50_PM.png) cc: @jschatz1 See merge request !4490
-
Connor Shea authored
-
Connor Shea authored
-
Connor Shea authored
Make sure to mention the GNU Project and OSI-provided information regarding the GPL so no one tries to disagree with that decision.
-
Connor Shea authored
-
Connor Shea authored
-