summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* use destroy_allJames Lopez2017-01-311-3/+1
* remove old project members from projectJames Lopez2017-01-311-0/+4
* Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-...Kamil Trzciński2017-01-315-11/+4
|\
| * Removed unused methodFilipa Lacerda2017-01-262-7/+0
| * Remove unneeded 'borderless' from icons nameFilipa Lacerda2017-01-254-5/+5
| * added icons and fixed mini pipeline action dropdown iconsdimitrieh2017-01-254-4/+4
* | Merge branch 'feature/gb/expose-commit-and-mr-pipelines-api' into 'master'Rémy Coutable2017-01-317-7/+7
|\ \
| * | Fix cycle analytics code after improving serializersGrzegorz Bizon2017-01-277-7/+7
* | | Use full group name/path in UI dropdownsDmitriy Zaporozhets2017-01-301-0/+1
* | | Merge branch 'fix/import-encrypt-atts' into 'master' Douwe Maan2017-01-303-7/+20
|\ \ \
| * | | fix spec failurefix/import-encrypt-attsJames Lopez2017-01-301-1/+1
| * | | programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-301-0/+9
| * | | rename method and added note to export file spec about new encrypted attributesJames Lopez2017-01-301-2/+2
| * | | fix typoJames Lopez2017-01-301-1/+1
| * | | Ignore encrypted attributes in Import/ExportJames Lopez2017-01-303-7/+11
* | | | Improve performance of triggered chat commandszj-slow-service-fetchZ.J. van de Weg2017-01-301-3/+10
|/ / /
* | | update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-272-3/+3
* | | namespace assets rake tasks to gitlab:assets:*Mike Greiling2017-01-272-29/+47
* | | correct gzip files if they exist as wellMike Greiling2017-01-271-0/+19
* | | automatically correct CSS urls on assets:precompileMike Greiling2017-01-271-0/+10
* | | Move Gitlab::Shell and Gitlab::ShellAdapter files to lib/27280-fix-unititalized-constantRémy Coutable2017-01-272-0/+0
* | | Move ApplicationSetting DEFAULTS to `.defaults` insteadRémy Coutable2017-01-271-2/+2
* | | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-272-0/+6
|\ \ \ | |/ / |/| |
| * | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already...26943-fix-user-in-build-presenterRémy Coutable2017-01-252-2/+6
| * | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-241-1/+3
* | | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-261-0/+1
* | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-255-6/+16
|\ \ \
| * \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-258-45/+29
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2432-174/+370
| |\ \ \
| * \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-1950-235/+744
| |\ \ \ \
| * | | | | Add more SyntaxHighlightFilter and MathFilter testsDouwe Maan2017-01-171-2/+4
| * | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-171-0/+1
| * | | | | Improve specDouwe Maan2017-01-161-3/+4
| * | | | | Copying a rendered issue/comment will paste into GFM textareas as actual GFMDouwe Maan2017-01-165-6/+12
* | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-254-0/+116
|\ \ \ \ \ \
| * | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-254-0/+116
* | | | | | | Merge branch 'fix-ci-requests-concurrency' into 'master' Grzegorz Bizon2017-01-251-9/+16
|\ \ \ \ \ \ \
| * | | | | | | Return struct instead of multiple valuesKamil Trzcinski2017-01-251-5/+5
| * | | | | | | Fix specsKamil Trzcinski2017-01-251-0/+1
| * | | | | | | Fix picking CI buildsKamil Trzcinski2017-01-251-9/+15
* | | | | | | | Merge branch 'backport-ee-changes-for-build-minutes' into 'master' Grzegorz Bizon2017-01-252-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove unneeded code and fix offensesbackport-ee-changes-for-build-minutesKamil Trzcinski2017-01-252-25/+1
| * | | | | | Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-bui...Kamil Trzcinski2017-01-2430-172/+352
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Backport changes introduced by https://gitlab.com/gitlab-org/gitlab-ee/merge_...Kamil Trzcinski2017-01-203-2/+27
* | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-253-4/+8
|\ \ \ \ \ \ \
| * | | | | | | address commentsJarka Kadlecova2017-01-251-0/+1
| * | | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-183-5/+8
* | | | | | | | Merge branch 'grapify-branch-api' into 'master'Rémy Coutable2017-01-251-6/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Grapify last endpoint of the branches APIgrapify-branch-apiRobert Schilling2017-01-241-6/+1
* | | | | | | | | Merge branch 'mrchrisw/rake-redis' into 'master' Stan Hu2017-01-251-1/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |