summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'Douwe Maan2018-05-011-1/+14
|\
| * Use persisted diff data instead fetching Git on discussionsOswaldo Ferreira2018-04-301-1/+14
* | Merge request and commit discussions APIJan Provaznik2018-05-011-0/+4
|/
* Ensure member notifications are sent after the member actual creation/update ...Rémy Coutable2018-04-262-6/+6
* Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-256-36/+33
|\
| * Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-256-36/+33
* | Cleanup after adding MR diff's commit_count (try 2)Jan Provaznik2018-04-251-4/+0
* | Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-04-243-9/+12
|\ \
| * | Allow admins to push to empty reposBob Van Landuyt2018-04-243-9/+12
* | | Merge branch '10244-add-project-ci-cd-settings' into 'master'Kamil Trzciński2018-04-242-0/+22
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into 10244-add-project-ci-cd-settingsDylan Griffith2018-04-2438-157/+306
| |\ \
| * | | Introduce new ProjectCiCdSetting10244-add-project-ci-cd-settingsYorick Peterse2018-04-162-0/+22
* | | | Merge branch '44447-expose-deploy-token-to-ci-cd' into 'master'Grzegorz Bizon2018-04-243-0/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Refactor deploy token methods on Ci::BuildMayra Cabrera2018-04-203-5/+9
| * | | Ensure deploy tokens variables are not available in the context of only/exceptMayra Cabrera2018-04-201-3/+5
| * | | Rename special deploy token to make it more descriptiveMayra Cabrera2018-04-203-3/+3
| * | | Expose deploy token to CI/CD jobs as environment variableMayra Cabrera2018-04-203-0/+14
* | | | Resolve "Avatar URLs are wrong when using a CDN path and Object Storage"Micaël Bergeron2018-04-231-2/+3
| |_|/ |/| |
* | | Resolve "Namespace factory is problematic"Lin Jen-Shin2018-04-232-1/+10
* | | Flowdock uses Gitaly, not GritZeger-Jan van de Weg2018-04-231-1/+47
|/ /
* | Atomic internal ids for all modelsAndreas Brandl2018-04-206-28/+15
* | Merge branch '42803-show-new-branch-mr-button' into 'master'Sean McGivern2018-04-202-12/+26
|\ \
| * | Moves Uniquify counter in the initializerJacopo2018-04-192-12/+17
| * | Uses Uniquify to calculate Issue#suggested_branch_nameJacopo2018-04-192-6/+9
| * | Shows new branch/mr button even when branch existsJacopo2018-04-191-5/+11
* | | Resolve "Improve tooltips of collapsed sidebars"Dennis Tang2018-04-191-2/+2
* | | Merge branch 'sh-fix-award-emoji-nplus-one-participants' into 'master'Yorick Peterse2018-04-191-1/+1
|\ \ \
| * | | Fix N+1 queries when loading participants for a commit noteStan Hu2018-04-181-1/+1
* | | | Merge branch 'blackst0ne-rails5-update-user-manageable-groups' into 'master'Yorick Peterse2018-04-191-4/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | [Rails5] Fix `User#manageable_groups`blackst0ne2018-04-191-4/+7
* | | | Fix direct_upload when records with null file_store are usedKamil Trzciński2018-04-192-6/+11
* | | | Merge branch '41059-calculate-artifact-size-more-efficiently' into 'master'Grzegorz Bizon2018-04-193-23/+50
|\ \ \ \
| * | | | Update ProjectStatistics#build_artifacts_size synchronously without summing (...Dylan Griffith2018-04-193-23/+50
| |/ / /
* | | | Merge branch '5320-fix-gitlab-features-env-var' into 'master'Grzegorz Bizon2018-04-193-5/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Get GITLAB_FEATURES from Project#licensed_features instead of Namespace#featu...5320-fix-gitlab-features-env-varDylan Griffith2018-04-093-5/+5
* | | | Merge branch 'revert-goldiloader' into 'master'Robert Speicher2018-04-1815-41/+41
|\ \ \ \
| * | | | Revert the addition of goldiloaderYorick Peterse2018-04-1815-41/+41
* | | | | Merge branch 'bvl-shared-groups-on-group-page' into 'master'Rémy Coutable2018-04-181-1/+14
|\ \ \ \ \
| * | | | | Recover from errors when a parent is not preloadedBob Van Landuyt2018-04-181-1/+14
| |/ / / /
* | | | | Fix Custom hooks are not triggered by UI wiki editFrancisco Javier López2018-04-182-10/+14
|/ / / /
* | | | Merge branch 'bw-commonmark-cached-markdown-version' into 'master'Sean McGivern2018-04-181-4/+26
|\ \ \ \
| * | | | for cached markdown fields, select the correct engineBrett Walker2018-04-171-4/+26
| | |_|/ | |/| |
* | | | Merge branch 'stuartnelson3/gitlab-ce-stn/issue-due-email' into 'master'Douwe Maan2018-04-182-1/+3
|\ \ \ \
| * \ \ \ Merge branch 'master' into 'stuartnelson3/gitlab-ce-stn/issue-due-email'Sean McGivern2018-04-1035-161/+362
| |\ \ \ \
| * | | | | Send emails for issues due tomorrowSean McGivern2018-03-301-0/+1
| * | | | | Only send issue due emails to participants and custom subscribersSean McGivern2018-03-301-1/+2
* | | | | | Resolve "Make a Rubocop that forbids returning from a block"🙈 jacopo beschi 🙉2018-04-183-10/+10
* | | | | | Merge branch '45456-improve-performance-of-cicd-jobs-request' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-1/+1
|\ \ \ \ \ \
| * | | | | | Move Ci::BuildMetadata#update_timeout_state to after_transition callbackTomasz Maczukin2018-04-171-1/+1
* | | | | | | Merge branch 'improve-jobs-queuing-time-metric' into 'master'Kamil Trzciński (OoO till 16th of April)2018-04-181-1/+1
|\ \ \ \ \ \ \
View Lorry Controller Status