summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-kubeclient' into 'master'Grzegorz Bizon2018-03-195-5/+5
|\
| * Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-1780-2188/+2825
| |\
| * | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-155-5/+5
* | | Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-193-28/+34
|\ \ \
| * | | Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-083-28/+34
* | | | Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master'Kamil Trzciński2018-03-183-6/+6
|\ \ \ \
| * | | | Use with_artifacts_archive name. Add specShinya Maeda2018-03-153-6/+6
| * | | | Add rubocop:disable GitlabSecurity/PublicSendShinya Maeda2018-03-151-1/+1
| * | | | Clarify ambiguous with_artifacts implicationShinya Maeda2018-03-153-6/+6
* | | | | Fix dropzone project showClement Ho2018-03-181-4/+17
| |_|_|/ |/| | |
* | | | Merge branch 'acet-notes-prettified' into 'master'Mike Greiling2018-03-1626-1792/+2149
|\ \ \ \
| * | | | Prettify notes.Fatih Acet2018-03-1626-1792/+2149
* | | | | Merge branch 'profile-notifications-dropdown-fix' into 'master'Filipa Lacerda2018-03-161-0/+7
|\ \ \ \ \
| * | | | | Fixed profile notifications not being editableprofile-notifications-dropdown-fixPhil Hughes2018-03-161-0/+7
* | | | | | Merge branch '39521-fix-merge-request-discussion-timestamp-overflow' into 'ma...Fatih Acet2018-03-161-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix discussion timestamp overflow in merge request parallel view39521-fix-merge-request-discussion-timestamp-overflowdtang2018-03-061-1/+1
* | | | | | Merge branch 'sh-optimize-admin-projects-page' into 'master'Robert Speicher2018-03-161-2/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix timeouts loading /admin/projects pagesh-optimize-admin-projects-pageStan Hu2018-03-151-2/+1
* | | | | | Merge branch '41902-add-api-option-to-overwrite-project-description-on-projec...Grzegorz Bizon2018-03-163-5/+6
|\ \ \ \ \ \
| * | | | | | Adds the option to override project description on export via APITiago Botelho2018-03-163-5/+6
| |/ / / / /
* | | | | | Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-164-49/+93
|\ \ \ \ \ \
| * | | | | | Use correct encoding with Lfs::FileTransfromerJames Edwards-Jones2018-03-152-5/+16
| * | | | | | Lfs::FileTranformer caches .gitattributes parserJames Edwards-Jones2018-03-151-1/+5
| * | | | | | Avoid failed integrity check by linking LfsObjectProjects soonerJames Edwards-Jones2018-03-153-35/+19
| * | | | | | Multi-file upload and Commit API obey LFS filtersJames Edwards-Jones2018-03-153-10/+55
| * | | | | | Rename Lfs::FileModificationHandler to Lfs::FileTransformerJames Edwards-Jones2018-03-152-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '43522-technical-debt-service-disabled_title' into 'master'Dmitriy Zaporozhets2018-03-164-19/+0
|\ \ \ \ \ \
| * | | | | | Removed unused `Service#disabled_title` methods43522-technical-debt-service-disabled_titleJames Edwards-Jones2018-03-154-19/+0
* | | | | | | Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-161-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Cache column_exists? for application settingssh-cache-column-existsStan Hu2018-03-151-3/+3
* | | | | | | | Fixes merge request bar styling when performance bar is visiblemr-sticky-tabs-perf-barPhil Hughes2018-03-151-0/+5
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge branch 'jivl-realtime-update-adding-file' into 'master'Phil Hughes2018-03-151-0/+22
|\ \ \ \ \ \ \
| * | | | | | | Add realtime pipeline status component for filesJose Ivan Vargas2018-03-141-0/+22
| |/ / / / / /
* | | | | | | Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into...Stan Hu2018-03-152-3/+13
|\ \ \ \ \ \ \
| * | | | | | | Only cache highlight results for latest MR diffsSean McGivern2018-03-152-3/+13
* | | | | | | | Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'42762-project-settings-sections-cannot-be-expanded-after-submission-errorKamil Trzciński2018-03-158-134/+130
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-141-2/+1
| |\ \ \ \ \ \ \
| * | | | | | | | DRY remaining instances of predefined variablesGrzegorz Bizon2018-03-145-34/+35
| * | | | | | | | Improve predefined variables collection methodsGrzegorz Bizon2018-03-141-11/+10
| * | | | | | | | Port deployment variables skeleton code from EEGrzegorz Bizon2018-03-142-5/+3
| * | | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-14423-894/+2202
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use new collections to define build predefined variablesGrzegorz Bizon2018-03-131-53/+50
| * | | | | | | | | Fix rubocop offense in auto devops predefined variablesGrzegorz Bizon2018-03-131-3/+4
| * | | | | | | | | Improve how we handle persistent runner variablesGrzegorz Bizon2018-03-132-9/+1
| * | | | | | | | | Make predefined variables in a collection public by defaultGrzegorz Bizon2018-03-131-9/+9
| * | | | | | | | | DRY project-level predefined variablesGrzegorz Bizon2018-03-133-16/+16
| * | | | | | | | | Use variables collection as build predefined variablesGrzegorz Bizon2018-03-123-26/+34
| * | | | | | | | | Extract variables collection item to a separate classGrzegorz Bizon2018-03-122-3/+5
| * | | | | | | | | Make variables collection to runner mapping explicitGrzegorz Bizon2018-03-071-1/+1
| * | | | | | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-072338-36889/+56128
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status