summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'performance/gb/improve-pipeline-creation-service' into 'master'Kamil Trzciński2018-04-261-5/+1
|\
| * Do not save associated records for pipeline builds twiceGrzegorz Bizon2018-04-251-5/+1
* | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-256-34/+28
|\ \
| * | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-256-34/+28
* | | Cleanup after adding MR diff's commit_count (try 2)Jan Provaznik2018-04-251-1/+1
| |/ |/|
* | Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' in...Rémy Coutable2018-04-251-1/+1
|\ \
| * | Backport dev env check for storage settings deprecationOswaldo Ferreira2018-04-241-1/+1
* | | Merge branch 'fix-settings-preloading' into 'master'Rémy Coutable2018-04-252-127/+0
|\ \ \ | |/ / |/| |
| * | Do not preload settingsKamil Trzciński2018-04-242-127/+0
* | | Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-04-241-2/+6
|\ \ \ | |/ / |/| |
| * | Allow admins to push to empty reposBob Van Landuyt2018-04-241-2/+6
| |/
* | Merge branch '10244-add-project-ci-cd-settings' into 'master'Kamil Trzciński2018-04-242-1/+5
|\ \
| * \ Merge branch 'master' into 10244-add-project-ci-cd-settingsDylan Griffith2018-04-2456-123/+478
| |\ \ | | |/
| * | Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settingsYorick Peterse2018-04-162-1/+5
* | | Merge branch 'jej/refactor-omniauth-controller' into 'master'Douwe Maan2018-04-246-4/+95
|\ \ \
| * | | Auth::User classes refactor adds should_save?James Edwards-Jones2018-04-233-14/+6
| * | | Replace define_method with alias_method in Omniauth ControllersJames Edwards-Jones2018-04-231-1/+1
| * | | Unify Saml::IdentityLinker and OAuth::IdentityLinkerJames Edwards-Jones2018-04-233-44/+28
| * | | Show error on failed OAuth account linkJames Edwards-Jones2018-04-222-4/+20
| * | | Refactor OmniauthCallbacksController to remove duplicationJames Edwards-Jones2018-04-226-2/+101
* | | | Merge branch 'bvl-warn-if-move-fails-on-mountpoint' into 'master'Douwe Maan2018-04-243-0/+18
|\ \ \ \ | |_|_|/ |/| | |
| * | | Describe workaround when restore fails because of `Errno::EBUSY`Bob Van Landuyt2018-04-233-0/+18
| |/ /
* | | Resolve "Namespace factory is problematic"Lin Jen-Shin2018-04-231-1/+3
* | | Merge branch '44713-fast-spec-helper' into 'master'Douwe Maan2018-04-233-1/+140
|\ \ \
| * | | Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rbRémy Coutable2018-04-232-4/+8
| * | | Address latest feedbackRémy Coutable2018-04-232-4/+7
| * | | Move Settings to its own file, isolate it from Rails and introduce Gitlab.rootRémy Coutable2018-04-232-0/+130
| * | | Introduce spec/fast_spec_helper.rb to run spec files that don't rely on the w...Rémy Coutable2018-04-231-0/+2
* | | | Moved committer and spec. Added some extra code to run hooks or not depending...Francisco Javier López2018-04-232-2/+10
|/ / /
* | | Merge branch '45576-fix-create-project-for-user-endpoint' into 'master'Rémy Coutable2018-04-231-2/+8
|\ \ \
| * | | Fix project creation for user endpoint bugMark Fletcher2018-04-231-2/+8
| |/ /
* | | Add 2FA filter to users API for admins onlyDmitriy Zaporozhets2018-04-231-1/+1
|/ /
* | Merge branch 'rd-45502-uploading-project-export-with-lfs-file-locks-fails' in...Douwe Maan2018-04-201-2/+0
|\ \
| * | Don't include lfs_file_locks data in export bundleRubén Dávila2018-04-191-2/+0
* | | Add an API endpoint to download git repository snapshotsNick Thomas2018-04-196-0/+79
* | | Merge branch 'zj-dev-setup-gitaly-check' into 'master'Robert Speicher2018-04-191-0/+11
|\ \ \
| * | | Check Gitaly when running `rake dev:setup`Zeger-Jan van de Weg2018-04-191-0/+11
* | | | Resolve "Show `failure_reason` in jobs view content section"Mayra Cabrera2018-04-191-0/+4
* | | | Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López2018-04-184-25/+84
|/ / /
* | | Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-1829-66/+65
* | | Merge branch '44981-http-io-trace-with-multi-byte-char' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-6/+16
|\ \ \
| * | | Make HTTPIO compatible with multi-byte chars (Extracted from ChunkedIO)Shinya Maeda2018-04-171-6/+16
| | |/ | |/|
* | | Merge branch 'zj-uri-type-empty' into 'master'Douwe Maan2018-04-181-0/+2
|\ \ \
| * | | Return nil on empty pathZeger-Jan van de Weg2018-04-171-0/+2
| |/ /
* | | [Rails5] Remove `as` keyword from `Gitlab:Ci:Trace:Stream.delegate :valid?`blackst0ne2018-04-181-1/+3
* | | Merge branch 'zj-ref-exists-opt-out' into 'master'Nick Thomas2018-04-171-1/+2
|\ \ \
| * | | Move Gitaly RefExists check to OPT_OUTZeger-Jan van de Weg2018-04-121-1/+2
* | | | Merge branch 'bvl-ignore-gitlab-pot-in-ee-compat-check' into 'master'Rémy Coutable2018-04-171-1/+1
|\ \ \ \
| * | | | Ignore `locale/gitlab.pot` in ee_compat_checkBob Van Landuyt2018-04-171-1/+1
* | | | | Merge branch 'add-dev-check-back-for-deprecations' into 'master'Rémy Coutable2018-04-171-1/+5
|\ \ \ \ \
View Lorry Controller Status