summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6'James Lopez2018-03-219-55/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.6] Fix GitLab Auth0 integration signs in the wrong user See merge request gitlab/gitlabhq!2354
| * | | | | | | | | | | | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-2139-79/+408
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* | | | | | | | | | | | | | | Merge branch '44453-performance-bar-modalbox' into 'master'Phil Hughes2018-03-223-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Performance bar modal box content overflows" Closes #44453 See merge request gitlab-org/gitlab-ce!17889
| * | | | | | | | | | | | | | | Fix class nameFilipa Lacerda2018-03-221-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into '44453-performance-bar-modalbox'44453-performance-bar-modalboxPhil Hughes2018-03-22217-1250/+2795
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/performance_bar/components/detailed_metric.vue
| * | | | | | | | | | | | | | | | Prevent column with smaller width in performance barFilipa Lacerda2018-03-211-2/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into 44453-performance-bar-modalboxFilipa Lacerda2018-03-21155-331/+9448
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Changes empty project avatar to identicon in the IDE Apply NestingDepth (level 5) (framework/dropdowns.scss) Strip any query string parameters from Location headers from lograge Added monitoring docs Resolve "Loss of input text on comments after preview" fixed ide_edit_button not existing Update spec import path for vue mount component helper remove JS for cookie toggle move confirm_danger_modal bindings directly into the only two pages that need it remove un-used IDE helper module fixed SCSS lint updated file references in specs Move IDE to CE Fix test failures with licensee 8.9 refactor ConfirmDangerModal into ES module Update licensee 8.7.0 -> 8.9 Update gettext_i18n_rails_js 1.2.0 -> 1.3
| * | | | | | | | | | | | | | | | Adds a bigger width to the performance bar modal box and breaks the contentFilipa Lacerda2018-03-203-2/+14
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'docs/cache-clear-image' into 'master'Marcia Ramos2018-03-222-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add image for clearing the cache docs Closes gitlab-ee#4642 See merge request gitlab-org/gitlab-ce!17932
| * | | | | | | | | | | | | | | | | Add image for clearing the cache docsAchilleas Pipinellis2018-03-222-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/4642
* | | | | | | | | | | | | | | | | | Merge branch 'fix/remove-wiki-cache-clear' into 'master'Sean McGivern2018-03-221-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove calls to clear_cache from Git::Wiki Closes gitaly#1095 See merge request gitlab-org/gitlab-ce!17914
| * | | | | | | | | | | | | | | | | Remove calls to clear_cache from Git::Wikifix/remove-wiki-cache-clearAhmad Sherif2018-03-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were probably added to compensate for tests shortcomings, but now they don't complain. Closes gitaly#1095
* | | | | | | | | | | | | | | | | | Merge branch 'ce-version-of-ee-4295' into 'master'Achilleas Pipinellis2018-03-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI Jobs retry link See merge request gitlab-org/gitlab-ce!17913
| * | | | | | | | | | | | | | | | | Fix CI Jobs retry linkGeorge Tsiolis2018-03-211-2/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '37987-speed-up-pipeline-creation' into 'master'Kamil Trzciński2018-03-222-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed Up Pipeline Creation See merge request gitlab-org/gitlab-ce!17443
| * | | | | | | | | | | | | | | | | Add inverse_of: :pipeline for pipeline.builds (#37987)37987-speed-up-pipeline-creationDylan Griffith2018-03-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This appears to reduce the number of queries in pipeline creation of gitlab-ce's .gitlab-ci.yml by 92 This also means we now need to mock this ci yaml file properly in the test because otherwise the yaml_errors stay on the object and make all the pipelines failed.
* | | | | | | | | | | | | | | | | | Merge branch 'move-email-footer-info-to-single-line' into 'master'Filipa Lacerda2018-03-222-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move email footer info to a single line See merge request gitlab-org/gitlab-ce!17916
| * | | | | | | | | | | | | | | | | Move email footer info to a single linemove-email-footer-info-to-single-lineEric Eastwood2018-03-212-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031#note_64372406
* | | | | | | | | | | | | | | | | | Merge branch 'performance-bar-position-fix' into 'master'Filipa Lacerda2018-03-228-59/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix performance bar spacing See merge request gitlab-org/gitlab-ce!17912
| * | | | | | | | | | | | | | | | | | fixed karmaperformance-bar-position-fixPhil Hughes2018-03-211-10/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | removed check for hostPhil Hughes2018-03-214-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed wrapper to container with correct widths
| * | | | | | | | | | | | | | | | | | Fix performance bar spacingPhil Hughes2018-03-215-16/+34
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'sh-fix-readonly-reload' into 'master'Sean McGivern2018-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module See merge request gitlab-org/gitlab-ce!17925
| * | | | | | | | | | | | | | | | | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module ↵Stan Hu2018-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tree but is still active" Similar to #34047 and #29327
* | | | | | | | | | | | | | | | | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master'Douwe Maan2018-03-223-45/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OmniauthInitializer created to allow testing/refactoring of code from devise.rb See merge request gitlab-org/gitlab-ce!17881
| * | | | | | | | | | | | | | | | | | OmniauthInitializer refactoringjej/omniauth-initializer-refactorJames Edwards-Jones2018-03-221-33/+31
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Omniauth callbacks moved to methodsJames Edwards-Jones2018-03-201-26/+38
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | OmniauthInitializer created to improve devise.rbJames Edwards-Jones2018-03-203-45/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should simplify refactoring and allow testing
* | | | | | | | | | | | | | | | | | | Update VERSION to 10.7.0-prev10.7.0.preJames Lopez2018-03-221-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.6.0James Lopez2018-03-22151-749/+184
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | Merge branch 'add-query-counts-to-profiler-output' into 'master'Stan Hu2018-03-223-6/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add query counts by model to profiler output See merge request gitlab-org/gitlab-ce!17910
| * | | | | | | | | | | | | | | | | | Add query counts by model to profiler outputadd-query-counts-to-profiler-outputSean McGivern2018-03-213-6/+35
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2018-03-211-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.5.6Mark Fletcher2018-03-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.4.6Mark Fletcher2018-03-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Update CHANGELOG.md for 10.3.9Mark Fletcher2018-03-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | | | | | | Merge branch 'disable-btn-mr-when-posting-comment' into 'master'Fatih Acet2018-03-212-2/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disables the button when submitting comment. Closes #39661 See merge request gitlab-org/gitlab-ce!17918
| * | | | | | | | | | | | | | | | | | | Adds testsJacob Schatz2018-03-211-0/+14
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Disables the button when submitting comment.Jacob Schatz2018-03-211-2/+3
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'docs/ci-caching' into 'master'Marcia Ramos2018-03-214-86/+569
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on CI caching Closes #32515, #18945, and gitlab-runner#1621 See merge request gitlab-org/gitlab-ce!12183
| * | | | | | | | | | | | | | | | | | | | Gather info on CI/CD cachingAchilleas Pipinellis2018-03-214-86/+569
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - New cache page - Move manual cache clearing to the new page - Add all directives of cache in the yaml reference
* | | | | | | | | | | | | | | | | | | | | Merge branch 'refactor/move-time-tracking-vue-components' into 'master'Filipa Lacerda2018-03-214-98/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move TimeTrackingCollapsedState vue component See merge request gitlab-org/gitlab-ce!17399
| * | | | | | | | | | | | | | | | | | | | | Move TimeTrackingCollapsedState vue componentGeorge Tsiolis2018-03-214-98/+109
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'docs/clarify-mail-room-procfile-location' into 'master'Sean McGivern2018-03-212-9/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify location of Procfile for mail_room See merge request gitlab-org/gitlab-ce!17896
| * | | | | | | | | | | | | | | | | | | | | Launch mail_room manually and remove foreman referenceEric Eastwood2018-03-212-9/+2
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'update-omniauth' into 'master'Robert Speicher2018-03-212-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update omniauth 1.4.2 -> 1.8 See merge request gitlab-org/gitlab-ce!17763
| * | | | | | | | | | | | | | | | | | | | | Update omniauth 1.4.2 -> 1.8Pirate Praveen2018-03-212-4/+4
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'ee-5063-to-ce-backport' into 'master'Douwe Maan2018-03-213-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE See merge request gitlab-org/gitlab-ce!17909
| * | | | | | | | | | | | | | | | | | | | | | Backports changes made in ↵ee-5063-to-ce-backportTiago Botelho2018-03-213-5/+5
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5063 to CE
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-add-second-gemfile' into 'master'Robert Speicher2018-03-213-5/+1255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Add `Gemfile.rails5` See merge request gitlab-org/gitlab-ce!17761