summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-032-3/+3
|\
| * replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-032-3/+3
* | Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-1/+1
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0240-213/+493
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2696-378/+3987
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-0468-602/+1434
| |\ \ \ \
| * | | | | Unify parameters and callback after hooksLin Jen-Shin2016-12-141-1/+1
* | | | | | Merge branch '20452-remove-require-from-request_profiler-initializer' into 'm...27537-flash-of-human-un-friendly-utc-timestampRobert Speicher2017-02-021-2/+1
|\ \ \ \ \ \
| * | | | | | Don't require lib/gitlab/request_profiler/middleware.rb in config/initializer...20452-remove-require-from-request_profiler-initializerRémy Coutable2017-02-021-2/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '20248-add-coverage-regex-in-job-yaml' into 'master'Douwe Maan2017-02-026-15/+85
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make some other refinements to validation logicLeandro Camargo2017-01-251-2/+2
| * | | | | Make more code improvements around the '/' stripping logicLeandro Camargo2017-01-252-8/+8
| * | | | | Force coverage value to always be surrounded by '/'Leandro Camargo2017-01-253-17/+40
| * | | | | Comply to more requirements and requests made in the code reviewLeandro Camargo2017-01-252-4/+3
| * | | | | Simplify coverage setting and comply to some requests in code reviewLeandro Camargo2017-01-251-15/+5
| * | | | | Fix wrong description for Coverage entry (in ruby comments)Leandro Camargo2017-01-251-1/+1
| * | | | | Add specs to cover the implemented feature and fix a small bugLeandro Camargo2017-01-251-1/+1
| * | | | | Add `coverage` to the Global config entry as wellLeandro Camargo2017-01-251-1/+4
| * | | | | Change expected `coverage` structure for CI configuration YAML fileLeandro Camargo2017-01-253-8/+18
| * | | | | Comply to requests made in the review and adjust to the Entry/Node changesLeandro Camargo2017-01-253-7/+8
| * | | | | Add ability to define a coverage regex in the .gitlab-ci.ymlLeandro Camargo2017-01-254-5/+49
* | | | | | Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' Robert Speicher2017-02-011-3/+8
|\ \ \ \ \ \
| * | | | | | Reduce hits to LDAP on Git HTTP auth by reordering auth mechanismsDrew Blessing2017-01-301-3/+8
* | | | | | | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-0116-182/+442
|\ \ \ \ \ \ \
| * | | | | | | Improve styling of the new issue messagezj-format-chat-messagesZ.J. van de Weg2017-01-311-2/+2
| * | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-307-13/+38
| * | | | | | | Rename presenters for consitencyZ.J. van de Weg2017-01-3010-32/+30
| * | | | | | | Incorporate feedbackZ.J. van de Weg2017-01-309-180/+279
| * | | | | | | Add help commandZ.J. van de Weg2017-01-303-8/+53
| * | | | | | | Chat Commands have presentersZ.J. van de Weg2017-01-3013-173/+266
| |/ / / / / /
* | | | | | | 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
* | | | | | | | 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
| |_|/ / / / / |/| | | | | |
* | | | | | | update scripts and docs to reference the newly namespaced rake taskrelative-url-assetsMike Greiling2017-01-271-1/+1
* | | | | | | 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
| |_|_|_|/ |/| | | |