summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'force-reload-arguments-1' into 'master'Robert Speicher2018-11-261-1/+2
|\
| * Passing an argument to force an association to reload is now deprecatedJasper Maes2018-11-261-1/+2
* | Merge branch 'ce-rd-extract-ee-specific-sidekiq-queue-config' into 'master'Robert Speicher2018-11-261-1/+1
|\ \
| * | Backport of gitlab-ee!8470ce-rd-extract-ee-specific-sidekiq-queue-configRubén Dávila2018-11-191-1/+1
* | | Merge branch '54407-fix-limited-intersection-observers' into 'master'Tim Zallmann2018-11-261-1/+3
|\ \ \ | |_|/ |/| |
| * | Use intersectionRatio to determine intersectionLukas Eipert2018-11-261-1/+3
* | | Merge branch 'ce-1979-move-mr-approval-settings' into 'master'Filipa Lacerda2018-11-261-0/+2
|\ \ \
| * | | CE port of "Move merge request approval settings"ce-1979-move-mr-approval-settingsPaul Slaughter2018-11-161-0/+2
* | | | Merge branch 'gt-update-externalized-strings-from-app-views-project-runners' ...Fatih Acet2018-11-261-1/+1
|\ \ \ \
| * | | | Update externalized strings from `/app/views/project/runners`George Tsiolis2018-11-261-1/+1
* | | | | Merge branch 'i18n-extract-app/views/shared-members' into 'master'Dmitriy Zaporozhets2018-11-265-23/+22
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | i18n: externalize strings from 'app/views/shared/members'Tao Wang2018-11-265-23/+22
* | | | | Merge branch 'dm-batch-loader-key' into 'master'Stan Hu2018-11-264-16/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Treat Repository instances with the same disk path as the same hash keydm-batch-loader-keyDouwe Maan2018-11-261-1/+7
| * | | | Batch load only data from same repository when lazy object is accessedDouwe Maan2018-11-263-15/+11
* | | | | Merge branch 'winh-issue-board-switcher-vue' into 'master'Fatih Acet2018-11-261-2/+1
|\ \ \ \ \
| * | | | | Refactor issue boards switcher to single file Vue component (CE-port)winh-issue-board-switcher-vueWinnie Hellmann2018-11-211-2/+1
* | | | | | Merge branch 'qa-193-ldap-group-sync-ce' into 'master'Grzegorz Bizon2018-11-261-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add qa classSanad Liaquat2018-11-261-1/+1
* | | | | | Merge branch 'gt-externalize-app-views-project-runners' into 'master'Fatih Acet2018-11-264-10/+8
|\ \ \ \ \ \
| * | | | | | Externalize strings from `/app/views/project/runners`George Tsiolis2018-11-234-10/+8
* | | | | | | Attempt to fix lazy loader spec transient failureLuke Bennett2018-11-261-3/+3
* | | | | | | WebIDE: Make Ctrl+Enter automatically commit when commit textarea is focusedThomas Pathier2018-11-263-0/+14
* | | | | | | Run `yarn prettier-all-save`Steve Azzopardi2018-11-261-5/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'speed-up-relative-positioning' into 'master'Douglas Barbosa Alexandre2018-11-232-14/+36
|\ \ \ \ \ \
| * | | | | | Speed up setting of relative positionspeed-up-relative-positioningSean McGivern2018-11-232-14/+36
* | | | | | | Merge branch '52371-filter-by-none-any-for-labels-in-issues-mrs-api' into 'ma...Nick Thomas2018-11-233-8/+13
|\ \ \ \ \ \ \
| * | | | | | | Filter by `None`/`Any` for labels in issues/mrs APIJacopo2018-11-233-8/+13
* | | | | | | | Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'Kamil Trzciński2018-11-2320-39/+92
|\ \ \ \ \ \ \ \
| * | | | | | | | Promote the GitLab.com Gold trial on a users default dashboardce-6983-promote-starting-a-gitlab-com-trialLuke Bennett2018-11-2120-39/+92
* | | | | | | | | Set content disposition attachment to several endpointsFrancisco Javier López2018-11-231-1/+2
* | | | | | | | | Merge branch 'certmanager-temp' into 'master'Kamil Trzciński2018-11-239-1/+120
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix failign testsAmit Rathi2018-11-231-1/+1
| * | | | | | | | | change load_file to safe_loadAmit Rathi2018-11-231-1/+1
| * | | | | | | | | cert manager changes based on review commentsAmit Rathi2018-11-231-1/+5
| * | | | | | | | | Addressing review commentsAmit Rathi2018-11-232-7/+9
| * | | | | | | | | Fix typo in cert_managerAmit Rathi2018-11-211-1/+1
| * | | | | | | | | Cert manager model spec and email presence validationAmit Rathi2018-11-211-0/+2
| * | | | | | | | | Merge branch 'master' into certmanager-tempAmit Rathi2018-11-2054-229/+235
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prettify filesAmit Rathi2018-11-201-1/+1
| * | | | | | | | | | Remove externalIp attribute from cert-managerAmit Rathi2018-11-201-1/+0
| * | | | | | | | | | Remove linter complaints from cert_manager.rbAmit Rathi2018-11-201-49/+49
| * | | | | | | | | | Update the UI message for cert-manager installationAmit Rathi2018-11-201-8/+21
| * | | | | | | | | | Merge branch 'master' into certmanager-tempAmit Rathi2018-11-19205-836/+929
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cleaned up cert_managerAmit Rathi2018-11-191-11/+2
| * | | | | | | | | | | New cert-manager logoAmit Rathi2018-11-161-0/+0
| * | | | | | | | | | | Change cert-manager logoAmit Rathi2018-11-161-0/+0
| * | | | | | | | | | | Move ingress shim config from --set to values.yamlAmit Rathi2018-11-161-7/+1
| * | | | | | | | | | | Set appropriate RBAC flag for cluster applicationsAmit Rathi2018-11-151-2/+1
| * | | | | | | | | | | Merge branch 'master' into certmanager-tempAmit Rathi2018-11-1421-102/+116
| |\ \ \ \ \ \ \ \ \ \ \