summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'revert-3755d828' into 'master'Phil Hughes2018-07-102-2/+2
* Merge branch '48897-mr-refactor-parallel-and-diff-view-are-being-rendered-at-...Fatih Acet2018-07-091-2/+2
* Merge branch '48906-adding-a-diff-line-note-freezes-the-browser' into 'master'Fatih Acet2018-07-093-4/+12
* Merge branch '48898-mr-refactor-performance-costs-of-main-element-with-v-if' ...Filipa Lacerda2018-07-096-31/+59
* Merge branch '48670-application-settings-may-not-be-invalidated-if-migrations...Stan Hu2018-07-071-2/+2
|\
| * Stop relying on migrations in the CacheableAttributes cache key and cache att...Rémy Coutable2018-07-051-2/+2
* | Redesign for mr widget info and pipelines sectionClement Ho2018-07-0611-230/+444
* | Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma...Sean McGivern2018-07-066-14/+64
|\ \
| * | Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-066-14/+64
* | | Use proper markdown rendering for previewsBrett Walker2018-07-0626-25/+122
* | | Merge branch 'sh-guard-repository-checks' into 'master'Robert Speicher2018-07-062-4/+29
|\ \ \
| * | | Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker}Stan Hu2018-07-062-4/+29
* | | | Merge branch 'ce-5448-move-mailers-previews' into 'master'Robert Speicher2018-07-064-0/+210
|\ \ \ \
| * | | | Disable public_send for our preview mailersLin Jen-Shin2018-07-061-1/+1
| * | | | Move spec/mailers/previews to app/mailers/previewsLin Jen-Shin2018-07-064-0/+210
* | | | | Merge branch 'gitaly-dont-use-path' into 'master'Sean McGivern2018-07-061-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove silly use of repo disk pathJacob Vosmaer2018-07-061-2/+2
* | | | | Merge branch 'rc-qa-146' into 'master'Grzegorz Bizon2018-07-062-3/+3
|\ \ \ \ \
| * | | | | [QA] Add a new scenario to test GitHub importRémy Coutable2018-07-062-3/+3
| |/ / / /
* | | | | Delete deprecated object_storage_upload queueJan Provaznik2018-07-062-24/+0
* | | | | Merge branch 'fl-mr-refactor-performance-improvements' into 'master'Tim Zallmann2018-07-066-50/+38
|\ \ \ \ \
| * | | | | Exports getters individually.Filipa Lacerda2018-07-066-50/+38
* | | | | | (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-07-064-3/+74
* | | | | | Merge branch 'revert-e76b176d' into 'master'Clement Ho2018-07-061-6/+5
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'rosulk-patch-12' into 'master'"Victor Wu2018-07-061-6/+5
* | | | | | | Resolve "Add dropdown to Groups link in top bar"Dennis Tang2018-07-0631-765/+830
* | | | | | | Merge branch 'bvl-preload-parents-after-pagination' into 'master'Douwe Maan2018-07-062-16/+28
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Preload ancestors after pagination when filteringBob Van Landuyt2018-07-062-16/+28
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-ex...Yorick Peterse2018-07-061-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | [Rails5] Fix milestone GROUP BY queryblackst0ne2018-07-061-1/+2
* | | | | | Merge branch '6653-extract-ee-specific-files-lines-for-discussion-app-service...Douwe Maan2018-07-061-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Extract EE-specific lines from NotificationServiceSean McGivern2018-07-061-0/+6
* | | | | | Merge branch 'build-chunks-on-object-storage' into 'master'Grzegorz Bizon2018-07-065-86/+204
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-06146-546/+1325
| |\ \ \ \ \
| * | | | | | Decouple optimization for erasing traceShinya Maeda2018-07-041-1/+1
| * | | | | | Rename retry_max left overs to retriesShinya Maeda2018-07-041-1/+1
| * | | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-0421-159/+304
| |\ \ \ \ \ \
| * | | | | | | Add spec for ExclusiveLeaseHelpersShinya Maeda2018-07-032-23/+1
| * | | | | | | Rename retries and remove retry_maxShinya Maeda2018-07-031-3/+2
| * | | | | | | Fix error messageShinya Maeda2018-07-031-1/+1
| * | | | | | | Rename persistable_store instead of persist_storeShinya Maeda2018-07-031-2/+2
| * | | | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-07-03435-3142/+4465
| |\ \ \ \ \ \ \
| * | | | | | | | Support append/truncate for fog storebuild-chunks-on-object-storageShinya Maeda2018-06-251-2/+2
| * | | | | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-25254-1319/+5007
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added spec for build trace chunkShinya Maeda2018-06-252-11/+14
| * | | | | | | | | Rename persisted? to data_persisted?Shinya Maeda2018-06-182-12/+8
| * | | | | | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-1897-318/+343
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix dead lock by in_lock conflicts. Shared out in_lock logic. Changed key_r...Shinya Maeda2018-06-154-37/+51
| * | | | | | | | | | Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-15368-2181/+3084
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into build-chunks-on-object-storageShinya Maeda2018-06-12209-1072/+1932
| |\ \ \ \ \ \ \ \ \ \ \