summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable frozen string for lib/gitlab/cigfyoung2018-10-2690-2/+188
| | | | | | | | | | | | Enables frozen string for the following: * lib/gitlab/ci/*.rb * lib/gitlab/ci/build/**/*.rb * lib/gitlab/ci/config/**/*.rb * lib/gitlab/ci/pipeline/**/*.rb * lib/gitlab/ci/reports/**/*.rb Partially addresses #47424.
* Merge branch '51335-fail-early-when-user-cannot-be-identified' into 'master'Douwe Maan2018-10-266-127/+98
|\ | | | | | | | | | | | | User not defined in PostReceive#process_project_changes Closes #51335 See merge request gitlab-org/gitlab-ce!22519
| * Removes idenfitication by commit from Gitlab::Identifier51335-fail-early-when-user-cannot-be-identifiedTiago Botelho2018-10-255-73/+25
| | | | | | | | | | | | | | Before we would need to identify a user when pushing through the GitLab UI. Since this is no longer the case we can remove the identification by commit and instead, use the identify_using_user
| * User not defined in PostReceive#process_project_changesTiago Botelho2018-10-254-62/+81
| | | | | | | | | | | | | | When Gitlab::GitPostReceive#changes_refs is empty user would not get defined and nil would be passed to PostReceive#after_project_changes_hooks which would then throw an error.
* | Merge branch ↵Douwe Maan2018-10-2616-49/+322
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master' Adds trace of each access check when git push times out Closes #42790 See merge request gitlab-org/gitlab-ce!22265
| * | Bumps GitLab Shell version42790-improve-feedback-for-internal-git-access-checks-timeoutsTiago Botelho2018-10-261-1/+1
| | |
| * | Reverts commits_check messageTiago Botelho2018-10-261-1/+1
| | |
| * | Iterating through commit list times outTiago Botelho2018-10-254-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | Validating each commit on ChangeAccess times out if it already took too long to complete. Improves the TimedLogger specs to not make use of a stubbed class anymore
| * | Refactors TimedLogger to be more OOP compliantTiago Botelho2018-10-253-14/+26
| | | | | | | | | | | | | | | | | | | | | Adds a #full_message method so that external classes do not have access to the state of the logger. Adds a #append_message to always append to the array in-place
| * | Adds tracing messages for slow git pushesTiago Botelho2018-10-2515-48/+317
| |/ | | | | | | | | | | Whenever a git push takes more than 50 seconds the user will receive a trace from each check performed along with their timings
* | Merge branch 'pl-uprade-prometheus-alertmanager' into 'master'Douwe Maan2018-10-262-1/+8
|\ \ | | | | | | | | | | | | Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2 See merge request gitlab-org/gitlab-ce!22600
| * | Upgrade Prometheus and alertmanagerpl-uprade-prometheus-alertmanagerPeter Leitzen2018-10-252-1/+8
| | | | | | | | | | | | Upgrade Prometheus to 2.4.3 and Alertmanager to 0.15.2
* | | Merge branch 'docs-add-runbooks' into 'master'Mike Lewis2018-10-262-0/+50
|\ \ \ | | | | | | | | | | | | | | | | docs add first draft for runbook topic See merge request gitlab-org/gitlab-ce!22588
| * | | update issue linkDaniel Gruesso2018-10-261-1/+1
| | | |
| * | | update runbooks linkDaniel Gruesso2018-10-261-1/+1
| | | |
| * | | Merge branch 'docs-add-runbooks' of gitlab.com:gitlab-org/gitlab-ce into ↵danielgruesso2018-10-261-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs-add-runbooks # Conflicts: # doc/topics/runbooks/index.md
| | * | | update to match EEdocs-add-runbooksDaniel Gruesso2018-10-251-5/+19
| | | | |
| | * | | push againDaniel Gruesso2018-10-240-0/+0
| | | | |
| | * | | Update index.mdDaniel Gruesso2018-10-241-1/+1
| | | | |
| * | | | relocate runbooks folder under clustersdanielgruesso2018-10-262-36/+49
| |/ / /
| * | | Add first draft for runbook docsdanielgruesso2018-10-232-0/+37
| | | |
* | | | Merge branch 'mlapierre-master-patch-62130' into 'master'Marin Jankovski2018-10-261-7/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update review apps testing guide See merge request gitlab-org/gitlab-ce!22619
| * | | | Update review apps testing guideMark Lapierre2018-10-261-7/+8
| | | | | | | | | | | | | | | | | | | | Review Apps are now deployed automatically. Note that if auth fails you might need to stop and redeploy the app.
* | | | | Merge branch 'qa-59-ldap-ssl-scenario' into 'master'Stan Hu2018-10-2610-10/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E2E Test - LDAP login with SSL Closes gitlab-qa#59 See merge request gitlab-org/gitlab-ce!22574
| * | | | | Add missing frozen_string_literalqa-59-ldap-ssl-scenarioSanad Liaquat2018-10-252-0/+4
| | | | | |
| * | | | | Rename SSL to TLSSanad Liaquat2018-10-2510-17/+17
| | | | | |
| * | | | | Fix rubocop issuesSanad Liaquat2018-10-241-0/+3
| | | | | |
| * | | | | Renamed to ldap_no_ssl and ldap_sslSanad Liaquat2018-10-248-10/+18
| | | | | |
| * | | | | Added ldap_ssl tag to existing testSanad Liaquat2018-10-243-1/+13
| | | | | |
* | | | | | Merge branch 'prettify-all-the-things-4' into 'master'Tim Zallmann2018-10-2642-631/+626
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 4) See merge request gitlab-org/gitlab-ce!22253
| * \ \ \ \ \ Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4Mike Greiling2018-10-261671-15638/+158455
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue
| * | | | | | | Prettify sidebar modulesMike Greiling2018-10-1714-254/+258
| | | | | | | |
| * | | | | | | Prettify registry and reports modulesMike Greiling2018-10-1715-291/+262
| | | | | | | |
| * | | | | | | Prettify protected_branches and protected_tags modulesMike Greiling2018-10-174-40/+68
| | | | | | | |
| * | | | | | | Prettify performance_bar notes and profile modulesMike Greiling2018-10-1710-142/+134
| | | | | | | |
* | | | | | | | Merge branch 'winh-split-merge-request-widget-dependencies' into 'master'Mike Greiling2018-10-269-83/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve circular dependencies in merge request widget See merge request gitlab-org/gitlab-ce!22605
| * | | | | | | | Resolve circular dependencies in merge request widgetwinh-split-merge-request-widget-dependenciesWinnie Hellmann2018-10-259-83/+50
| | | | | | | | |
* | | | | | | | | Merge branch ↵Mike Greiling2018-10-265-40/+32
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '45068-no-longer-require-a-deploy-to-start-prometheus-monitoring' into 'master' Resolve "No longer require a deploy to start Prometheus monitoring" Closes #45068 See merge request gitlab-org/gitlab-ce!22401
| * | | | | | | | Resolve "No longer require a deploy to start Prometheus monitoring"Peter Leitzen2018-10-265-40/+32
|/ / / / / / / /
* | | | | | | | Merge branch 'feature/add_license_to_project_api' into 'master'Nick Thomas2018-10-265-5/+119
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/add license to project API See merge request gitlab-org/gitlab-ce!21606
| * | | | | | | | Feature/add license to project APIJ.D. Bean2018-10-265-5/+119
|/ / / / / / / /
* | | | | | | | Merge branch 'winh-dynamic-tooltips' into 'master'Clement Ho2018-10-262-9/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update content of visible tooltips See merge request gitlab-org/gitlab-ce!22504
| * | | | | | | | Update content of visible tooltipsWinnie Hellmann2018-10-262-9/+38
|/ / / / / / / /
* | | | | | | | Merge branch '7864-ee-routes' into 'master'Sean McGivern2018-10-269-13/+99
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE: Put EE routes in EE files under EE directories See merge request gitlab-org/gitlab-ce!22376
| * | | | | | | | Make it clear that we intent to use | over ||Lin Jen-Shin2018-10-261-2/+3
| | | | | | | | |
| * | | | | | | | Allow CE do nothing if route doesn't exist7864-ee-routesLin Jen-Shin2018-10-263-6/+8
| | | | | | | | |
| * | | | | | | | Extract EE only oauth routes and add testsLin Jen-Shin2018-10-263-2/+38
| | | | | | | | |
| * | | | | | | | Make it possible to add EE only routeLin Jen-Shin2018-10-262-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And if it cannot find any routes, raise an error
| * | | | | | | | Put EE routes in EE files under EE directoriesLin Jen-Shin2018-10-266-13/+43
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bw-automatically-navigate-to-last-board-visited' into 'master'Nick Thomas2018-10-2619-5/+558
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically navigate to last board visited See merge request gitlab-org/gitlab-ce!22430
View Lorry Controller Status