summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add redis version to info rake taskmrchrisw/rake-redisChris Wilson2017-01-241-1/+4
* | | | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-243-34/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Rescue from ActiveRecord::UnknownAttributeError and fallback to fake settingsdont-persist-application-settings-in-test-env-bisRémy Coutable2017-01-232-5/+3
| * | | | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-232-32/+16
* | | | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-242-1/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Search feature: redirects to commit page if query is commit sha and only comm...YarNayar2017-01-242-1/+13
| * | | | | | | | | Allows to search within project by commit's hashYarNayar2017-01-241-1/+19
* | | | | | | | | | Merge branch 'zj-mattermost-api-update' into 'master' Grzegorz Bizon2017-01-243-8/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Small update to the Mattermost APIzj-mattermost-api-updateZ.J. van de Weg2017-01-243-8/+18
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'grapify-deploy-keys' into 'master' Rémy Coutable2017-01-241-9/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Grapify all endpoints of the deploy keys APIgrapify-deploy-keysRobert Schilling2017-01-231-9/+8
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-pick-security-fixes' into 'master' Robert Speicher2017-01-237-37/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch 'fix-guest-access-posting-to-notes' into 'security' Robert Speicher2017-01-231-10/+16
| * | | | | | | | | Merge branch 'fix-api-mr-permissions' into 'security'Robert Speicher2017-01-235-24/+21
| * | | | | | | | | Merge branch 'fix-users-deleting-public-deployment-keys' into 'security' Robert Speicher2017-01-231-3/+7
* | | | | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'...Douwe Maan2017-01-237-46/+103
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status