summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removing the two factor check when the user sets a new passwordfj-28141-redirection-loopFrancisco Javier López2018-03-011-0/+1
* Merge branch 'dz-system-hooks-plugins' into 'master'Douwe Maan2018-03-0116-0/+241
|\
| * Remove trailing line from plugin loggerdz-system-hooks-pluginsDmitriy Zaporozhets2018-02-281-1/+0
| * Improve plugins documentation and remove unnecessary rake taskDmitriy Zaporozhets2018-02-282-7/+9
| * Refactor plugins feature and make some doc improvementsDmitriy Zaporozhets2018-02-287-25/+44
| * Fix few typos in plugins docDmitriy Zaporozhets2018-02-271-4/+4
| * Refactor plugin execution methodDmitriy Zaporozhets2018-02-274-25/+49
| * [ci skip] Add example of rake plugins:validate output to the docDmitriy Zaporozhets2018-02-271-0/+8
| * Add documentation for plugins featureDmitriy Zaporozhets2018-02-271-0/+50
| * Add plugin feature to changelog [ci skip]Dmitriy Zaporozhets2018-02-271-0/+5
| * Few code improvements for spec/lib/gitlab/plugin_spec.rbDmitriy Zaporozhets2018-02-271-7/+7
| * Add plugin queue to all_queues.ymlDmitriy Zaporozhets2018-02-262-1/+2
| * Exclude plugins dir from rubocop and codeclimate configDmitriy Zaporozhets2018-02-262-0/+2
| * Add specs for Gitlab::Plugin [ci skip]Dmitriy Zaporozhets2018-02-261-0/+39
| * Handle excpetion in PluginWorkerDmitriy Zaporozhets2018-02-262-0/+29
| * Add plugin queue to sidekiq config [ci skip]Dmitriy Zaporozhets2018-02-263-3/+9
| * Use Gitlab::Popen instead of spawn [ci skip]Dmitriy Zaporozhets2018-02-261-16/+3
| * Add /plugins to gitignoreDmitriy Zaporozhets2018-02-261-1/+1
| * Reorganize plugins dir structureDmitriy Zaporozhets2018-02-264-2/+3
| * Run plugins as separate process and pass data via STDINDmitriy Zaporozhets2018-02-268-50/+27
| * Redesign plugins systemDmitriy Zaporozhets2018-02-264-30/+30
| * Remove plugin initializer and add plugins:validate rake taskDmitriy Zaporozhets2018-02-264-30/+41
| * Add generator for pluginsDmitriy Zaporozhets2018-02-262-0/+41
| * Add external plugins support to extend system hooksDmitriy Zaporozhets2018-02-263-0/+39
| * Ignore content in plugins dirDmitriy Zaporozhets2018-02-261-0/+1
| * Add plugins dirDmitriy Zaporozhets2018-02-261-0/+0
* | Merge branch 'ee-3727-epic-labels-backport' into 'master'Filipa Lacerda2018-03-015-15/+62
|\ \
| * | Add support for custom container classee-3727-epic-labels-backportKushal Pandya2018-03-011-1/+9
| * | Update class init configKushal Pandya2018-03-011-1/+3
| * | Update FilteredSearchManager init configKushal Pandya2018-03-011-2/+14
| * | Add group related config and endpoint methods to be consistent with EEKushal Pandya2018-03-012-11/+36
* | | Merge branch 'dispatcher-issuable-sidebar-backport' into 'master'Phil Hughes2018-03-014-38/+51
|\ \ \
| * | | init sidebar bundle separately to allow EE overrideSimon Knox2018-03-014-38/+51
|/ / /
* | | Merge branch 'fl-expandbutton-backport' into 'master'Phil Hughes2018-03-011-1/+1
|\ \ \
| * | | Use v-if in the expand button for performancefl-expandbutton-backportFilipa Lacerda2018-02-271-1/+1
* | | | Merge branch 'winh-inline-script-linter' into 'master'Rémy Coutable2018-03-0114-0/+21
|\ \ \ \
| * | | | Ignore InlineJavaScript linter in existing script tag locations.winh-inline-script-linterConnor Shea2018-02-2813-0/+15
| * | | | Update inline_javascript.rb to lint uses of the javascript filter as well as ...Connor Shea2018-02-281-1/+7
| * | | | Update inline_javascript.rbWinnie Hellmann2018-02-281-2/+2
| * | | | Forbid all inline script tags in Linter::InlineJavaScriptWinnie Hellmann2018-02-281-1/+1
* | | | | Merge branch 'sh-tag-migrations-with-sidekiq' into 'master'Rémy Coutable2018-03-012-2/+2
|\ \ \ \ \
| * | | | | Tag migration specs with :sidekiq to clear queues between testssh-tag-migrations-with-sidekiqStan Hu2018-02-282-2/+2
* | | | | | Merge branch 'build-finished-worker-spec-prepend' into 'master'Rémy Coutable2018-03-011-1/+1
|\ \ \ \ \ \
| * | | | | | Remove use of any_instance_of in runner specbuild-finished-worker-spec-prependYorick Peterse2018-02-281-1/+1
* | | | | | | Merge branch 'sh-bump-git-2.16' into 'master'DJ Mountney2018-03-012-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Add update for packed-refs with git v2.16sh-bump-git-2.16Stan Hu2018-02-281-1/+1
| * | | | | | Bump GitLab CI test image to use git v2.16Stan Hu2018-02-281-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'protected-tags-bundle-refactor' into 'master'Clement Ho2018-03-014-13/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into protect...protected-tags-bundle-refactorConstance Okoghenun2018-02-27229-1066/+1420
| |\ \ \ \ \
| * \ \ \ \ \ Resolved conflicts in app/assets/javascripts/pages/projects/settings/reposito...Constance Okoghenun2018-02-2698-651/+1133
| |\ \ \ \ \ \
View Lorry Controller Status