summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'ma...Grzegorz Bizon2017-01-212-16/+32
* Revert "Merge branch 'backport-fix-load-error' into 'master'"Stan Hu2017-01-211-3/+3
* Don't define ApplicationSetting defaults in a constantbackport-fix-load-errorRémy Coutable2017-01-201-3/+3
* Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-202-14/+6
|\
| * fix member mapper specfix/import-usersJames Lopez2017-01-201-2/+0
| * fix typoJames Lopez2017-01-191-1/+1
| * fix and refactor note user mappingJames Lopez2017-01-182-9/+3
| * added spec replicating the problemJames Lopez2017-01-181-1/+1
| * do not map usersat all unless adminJames Lopez2017-01-181-2/+2
* | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-202-32/+16
|\ \
| * | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-152-4/+16
| * | Move default values to ApplicationSetting::DEFAULTS and use it in CurrentSett...Rémy Coutable2017-01-151-29/+1
* | | Merge branch 'feature/gitaly-feature-flag' into 'master' Robert Speicher2017-01-191-1/+8
|\ \ \
| * | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flagAhmad Sherif2017-01-181-1/+8
* | | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-194-0/+88
|\ \ \ \
| * | | | More improvements to presenters23563-document-presentersRémy Coutable2017-01-182-6/+10
| * | | | Improve presenter factoryRémy Coutable2017-01-182-39/+22
| * | | | Improve presenter architectureRémy Coutable2017-01-184-32/+62
| * | | | Document presentersRémy Coutable2017-01-182-0/+71
| | |_|/ | |/| |
* | | | Merge branch 'fix/external-status-badge-links' into 'master' Kamil Trzciński2017-01-192-0/+35
|\ \ \ \
| * | | | Link external commit status badge to a target URLGrzegorz Bizon2017-01-171-2/+2
| * | | | Add detailed statuses for external commit statusesGrzegorz Bizon2017-01-172-0/+35
* | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-1831-210/+439
|\ \ \ \ \
| * | | | | fix specfix/refactor-cycle-analytics-stagesJames Lopez2017-01-171-2/+2
| * | | | | refactored a bunch of stuff based on feedbackJames Lopez2017-01-1710-43/+49
| * | | | | fix bug retrieving mediansJames Lopez2017-01-171-1/+1
| * | | | | fix specsJames Lopez2017-01-172-5/+5
| * | | | | refactored metrics fetcher - merged into stage and eventsJames Lopez2017-01-1715-119/+116
| * | | | | fix refactor of production event fetcherJames Lopez2017-01-172-17/+17
| * | | | | a few more fixesJames Lopez2017-01-172-18/+1
| * | | | | fix missing refactor in metrics fetcherJames Lopez2017-01-171-2/+2
| * | | | | fix plan stage issue and some spec failuresJames Lopez2017-01-173-3/+9
| * | | | | fix specs, refactor missing bits from events stuffJames Lopez2017-01-174-11/+12
| * | | | | big refactor based on MR feedbackJames Lopez2017-01-1721-117/+123
| * | | | | few fixes after mergeJames Lopez2017-01-172-3/+10
| * | | | | refactor fetcher and fixed specsJames Lopez2017-01-174-34/+22
| * | | | | refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-1713-61/+89
| * | | | | Fix other spec failuresJames Lopez2017-01-175-44/+5
| * | | | | more refactoring and fixing old specsJames Lopez2017-01-171-15/+3
| * | | | | added new summary serializers and refactor all of the summary stuff into sepa...James Lopez2017-01-175-0/+118
| * | | | | fixed stage entity and added missing stage specsJames Lopez2017-01-171-1/+5
| * | | | | added analytics stage serializer and moved some info to the stage classes fro...James Lopez2017-01-178-0/+44
| * | | | | WIP - started refactoring cycle analytics median stuff into stagesJames Lopez2017-01-1718-19/+111
| |/ / / /
* | | | | Merge branch 'time-tracking-api' into 'master' Sean McGivern2017-01-181-1/+5
|\ \ \ \ \
| * | | | | Add some API endpoints for time tracking.Ruben Davila2017-01-181-1/+5
* | | | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-182-0/+32
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | Backport backend work for time tracking.Ruben Davila2017-01-152-0/+32
| |/ / /
* | | | Remove some useless require_relative statements26756-fix-already-intialized-constant-warningsRémy Coutable2017-01-173-7/+0
|/ / /
* | | Allow to use + symbol in filenamesblackst0ne2017-01-151-2/+2
| |/ |/|
* | Merge branch '25018-gitlab-checks-changeaccess-looks-for-user-permissions-tha...Douwe Maan2017-01-141-2/+2
|\ \
View Lorry Controller Status