summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update Gitlab Shell to fix errors moving projects between storagesshell-updateAlejandro Rodríguez2016-10-072-1/+2
|
* Merge branch '23096-expire-artifacts-per-job' into 'master' Yorick Peterse2016-10-075-43/+100
|\ | | | | | | | | ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job… See merge request !6732
| * ExpireBuildArtifactsWorker query builds table without ordering enqueuing one ↵23096-expire-artifacts-per-jobPaco Guzman2016-10-075-43/+100
| | | | | | | | | | job per build to cleanup We use Sidekiq::Client.push_bulk to avoid Redis round trips
* | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-0713-0/+52
|\ \ | | | | | | | | | | | | Fix Ubuntu 16.04.1 update process using systemctl daemon-reload See merge request !6666
| * | Update 8.0-to-8.1.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.1-to-8.2.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.2-to-8.3.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.3-to-8.4.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.4-to-8.5.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.5-to-8.6.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.6-to-8.7.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.7-to-8.8.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.8-to-8.9.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.9-to-8.10.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.10-to-8.11.mdfidomax2016-10-041-0/+4
| | |
| * | Update 8.11-to-8.12.mdfidomax2016-10-041-0/+4
| | |
| * | Add systemctl daemon-reload to fix Ubuntu 16.04.1 warningfidomax2016-10-041-0/+4
| | |
* | | Merge branch '22774-retouch-environments-deployments' into 'master' Jacob Schatz2016-10-079-53/+134
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Retouch environments list and deployments list" ## What does this MR do? #### Environments List - Fixes deployment ID - Removes bold styling from deployment ID - Changes Las Deployment Column to have '#ID by user' - Adds build column with link to the build - Adds external url to where the environment is hosted #### Environment Details - Add link to the build column and changes content to show "build (#id) by user" - Adds external link to the review app Adds tests ## Screenshots (if relevant) #### Environments List ![env_list](/uploads/6cfd737bb0d2f2853a610479877de5a3/env_list.png) #### Environments Details ![env_details](/uploads/70ec59d7d7de5c1ef57132c2ec9c1b8f/env_details.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22774 See merge request !6691
| * | | Deletes extra empty line breaking the buildFilipa Lacerda2016-10-071-1/+0
| | | |
| * | | Updates test in order to look for link22774-retouch-environments-deploymentsFilipa Lacerda2016-10-071-2/+3
| | | |
| * | | Removes `try`Filipa Lacerda2016-10-061-1/+1
| | | |
| * | | Removes unused variableFilipa Lacerda2016-10-061-2/+0
| | | |
| * | | Adds test for external link in environment detailsFilipa Lacerda2016-10-061-0/+10
| | | |
| * | | Fixes external_url linkFilipa Lacerda2016-10-062-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests for: - external_url link in environmnets list - must show deployment internal id in environments list - must show build name and id in environments list
| * | | Adds CHANGELOG entryFilipa Lacerda2016-10-061-0/+1
| | | |
| * | | Removes Merge Request reference from commit column due to performance issuesFilipa Lacerda2016-10-061-4/+0
| | | |
| * | | Adds responsive behaviour equal to the one in Pipelines and Builds tableFilipa Lacerda2016-10-065-47/+54
| | | |
| * | | Fixes linter problemsFilipa Lacerda2016-10-061-1/+1
| | | |
| * | | Verifies if user is availableFilipa Lacerda2016-10-061-2/+4
| | | |
| * | | Removes 'hidden-xs' class from user_avatar helper in order for it to be ↵Filipa Lacerda2016-10-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | visible in environments list. Allows a class as an option to keep the hidden avatar behaviour in all the places it is needed.
| * | | Adds verification beore showing user avatarFilipa Lacerda2016-10-061-2/+3
| | | |
| * | | Adds external urlFilipa Lacerda2016-10-053-3/+24
| | | | | | | | | | | | | | | | Changes build column in environment details
| * | | Adds reference to the merge request in the commit columnFilipa Lacerda2016-10-052-0/+12
| | | |
| * | | Adds Build column to environments listFilipa Lacerda2016-10-053-0/+7
| | | |
| * | | Updates Last Deployment column in environmnets list according to designFilipa Lacerda2016-10-053-3/+8
| | | |
| * | | Updates Last Deployment column in environmnets list.Filipa Lacerda2016-10-052-2/+2
| | | | | | | | | | | | | | | | Fixes deployment id to show the internal one
* | | | Merge branch 'backport-part-of-ee-744' into 'master' Robert Speicher2016-10-071-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Member#add_user set access_level for requesters ## What does this MR do? This is a backport of https://gitlab.com/gitlab-org/gitlab-ee/commit/c902d8d48409a4d46f7669fc5fc85b9ba86e71d6 from gitlab-org/gitlab-ee!744. ## Why was this MR needed? This change is only used in EE right now, but there's no reason why it wouldn't be part of CE. See merge request !6649
| * | | | Make Member#add_user set access_level for requestersbackport-part-of-ee-744Rémy Coutable2016-10-031-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'rs-optimize-award_user_list-spec' into 'master' Rémy Coutable2016-10-072-16/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize the `award_user_list` helper spec According to https://gitlab.com/gitlab-org/gitlab-ce/issues/23034#note_16586657, each test for this helper generated 1,833 queries. Now we only generate stubbed records, and only as many as we need for each test. This also corrects a slight logic bug in the helper itself. When the number of awards was greater than the limit (9 by default), _and_ the current user was one of them, we actually included 10 names, including "You", plus the remaining count. Now we return the correct number regardless. See merge request !6722
| * | | | | Optimize the `award_user_list` helper specRobert Speicher2016-10-072-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://gitlab.com/gitlab-org/gitlab-ce/issues/23034#note_16586657, each test for this helper generated 1,833 queries. Now we only generate stubbed records, and only as many as we need for each test. This also corrects a slight logic bug in the helper itself. When the number of awards was greater than the limit (9 by default), _and_ the current user was one of them, we actually included 10 names, including "You", plus the remaining count. Now we return the correct number regardless.
* | | | | | Merge branch '23051-restore-missing-university-content' into 'master' Sid Sijbrandij2016-10-071-103/+179
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing content and improved layout ## What does this MR do? Restores lost content that was removed from the University landing page. Adds many videos, presentations and blog articles that were never in University. Improves the layout of the content. ## Are there points in the code the reviewer needs to double check? I'd like feedback on the content organisation, specifically if certain sub sections should be moved e.g. from Beginner to Intermediate. Keep in mind how this change will affect the relative difficulty of the other content. ## Why was this MR needed? The layout looked unprofessional and was missing crucial content. ## What are the relevant issue numbers? Closes #23051 See merge request !6741
| * | | | | | Added missing content and improved layout23051-restore-missing-university-contentSean Packham2016-10-071-103/+179
| | | | | | |
* | | | | | | Merge branch 'mrchrisw/remove-whitelist' into 'master' Robert Speicher2016-10-071-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update user whitelist reject message ## What does this MR do? Makes email whitelist rejection message more generic. Stops printing all `allowed_domains` ## Why was this MR needed? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23090 See merge request !6731
| * | | | | | | Update user whitelist reject messagemrchrisw/remove-whitelistdev-chris2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Don't expose all whitelisted domains
* | | | | | | | Merge branch 'sh-fix-events-update-spec' into 'master' Yorick Peterse2016-10-072-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Event#reset_project_activity updates See merge request !6729
| * | | | | | | | Fix Event#reset_project_activity updatessh-fix-events-update-specStan Hu2016-10-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | !6678 removed the lease from Event#reset_project_activity, but it wasn't actually updating the project's last_activity_at timestamp properly. The WHERE clause would always return no matching projects. The spec passed occasionally because the created_at timestamp was automatically set to last_activity_at.
* | | | | | | | | Merge branch 'memoize_shell_secret_token' into 'master' Rémy Coutable2016-10-076-21/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize Github::Shell's secret token ## What does this MR do? `API::Helpers#secret_token` was reading the secret file on every invocation. This MR reads the file in the `gitlab_shell_secret_token.rb` initializer and saves it as a class variable at `Gitlab::Shell.secret_token` ## Are there points in the code the reviewer needs to double check? - I'm not sure if the use of `cattr_accessor` is the best approach, or if should be moved into the `class << self` block? - Should `API::Helpers#secret_token` be removed in favor of using `Gitlab::Shell.secret_token`? ## Why was this MR needed? Performance optimization. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22510 See merge request !6599
| * | | | | | | | | Call ensure_secret_token! in secret token test's before block since it would ↵Justin DiPierro2016-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be called in an initializer.
| * | | | | | | | | Load Github::Shell's secret token from file on initialization instead of ↵Justin DiPierro2016-10-066-21/+40
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | every request.
* | | | | | | | | Merge branch 'ben.boeckel/gitlab-ce-api-visible-projects' into 'master' Rémy Coutable2016-10-074-154/+383
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add visible projects API ## What does this MR do? Add a new `/projects/visible` API endpoint. Originally created by @ben.boeckel in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5970. ## Are there points in the code the reviewer needs to double check? Does the API make sense? ## Why was this MR needed? The `/projects` endpoint only returned projects the user was explicitly a member of. Closes #19361, #3119. See merge request !6681
View Lorry Controller Status