- 07 Oct, 2016 32 commits
-
-
Stan Hu authored
Improve the contribution and MR review guide ## What does this MR do? This merge request improves the contributing and MR review guides following @stanhu's reply on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6096#note_16537211. ## Why was this MR needed? To clearly state that MR reviews can take multiple iterations but that as reviewers we should do our best to minimize the number of iterations and take over any MR that is set as "Merge when build succeeds" at some point. See merge request !6739
-
Yorick Peterse authored
ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job… See merge request !6732
-
Rémy Coutable authored
Fix Ubuntu 16.04.1 update process using systemctl daemon-reload See merge request !6666
-
Jacob Schatz authored
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  #### Environments Details  ## 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
-
Robert Speicher authored
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
-
Rémy Coutable authored
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
-
Filipa Lacerda authored
-
Sid Sijbrandij authored
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
-
Robert Speicher authored
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.
-
Rémy Coutable authored
Signed-off-by:Rémy Coutable <remy@rymai.me>
-
Sean Packham authored
-
Paco Guzman authored
ExpireBuildArtifactsWorker query builds table without ordering enqueuing one job per build to cleanup We use Sidekiq::Client.push_bulk to avoid Redis round trips
-
Rémy Coutable authored
Signed-off-by: -
Robert Speicher authored
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
-
Yorick Peterse authored
Fix Event#reset_project_activity updates See merge request !6729
-
Filipa Lacerda authored
-
Rémy Coutable authored
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
-
Rémy Coutable authored
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
-
Rémy Coutable authored
Resolve "NameError: undefined local variable or method `request' for #<Grape::Middleware::Error:0x007fc990..." ## What does this MR do? Switches from `request` to `env` in an API helper method as the helpers are included in contexts lacking `request`. ## Are there points in the code the reviewer needs to double check? I couldn't build a reproducer for this. Closes #22820 See merge request !6615
-
Robert Speicher authored
Cache rendered Markdown fields in the database ## What does this MR do? Introduces cache fields for Markdown-containing fields in the database, and populates them. ## Why was this MR needed? Rendering Markdown into HTML is performance-intensive. A Redis cache already exists, but this approach is expected to be more performant and reduce unnecessary cache invalidations. ## What are the relevant issue numbers? Closes #18337 See merge request !6095
-
Sean McGivern authored
-
Achilleas Pipinellis authored
Add notice about HTTPS cloning for CI ## What does this MR do? Adds a notice about potential problem with GitLab CI unable to clone sources: https://gitlab.com/gitlab-org/gitlab-ce/issues/22484#note_16612187 ## Issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22484 See merge request !6719
-
Stan Hu authored
!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.
-
dev-chris authored
+ Don't expose all whitelisted domains
-
Justin DiPierro authored
Call ensure_secret_token! in secret token test's before block since it would be called in an initializer.
-
Fatih Acet authored
Add tooltip to project fork count ## What does this MR do? Adds a tooltip reading `Forks` when a user hovers over the count of project forks. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Requested in #23066 ## Screenshots (if relevant)  ## 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 - [ ] 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) - [ ] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23066 See merge request !6718
-
Nick Thomas authored
-
Nick Thomas authored
This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.
-
Nick Thomas authored
Truncato is introduced as a dependency to intelligently shorten the rendered HTML to 200 characters; the previous approach could have resulted in invalid HTML being rendered.
-
Nick Thomas authored
-
Nick Thomas authored
This commit adds a number of _html columns and, with the exception of Note, starts updating them whenever the content of their partner fields changes. Note has a collision with the note_html attr_accessor; that will be fixed later A background worker for clearing these cache columns is also introduced - use `rake cache:clear` to set it off. You can clear the database or Redis caches separately by running `rake cache:clear:db` or `rake cache:clear:redis`, respectively.
-
Yorick Peterse authored
Memoize ActiveRecord::Migrator.migrations in tests See merge request !6723
-
- 06 Oct, 2016 8 commits
-
-
Jacob Schatz authored
Change issue board defaults #### What does this MR do? Changes the issue board default list from `Development`, `Testing`, `Production`, `Ready` to `To Do` and `Doing` #### Screenshots (if relevant)   #### What are the relevant issue numbers? Closes #23025 See merge request !6716
-
Annabel Dunstone Gray authored
-
Fatih Acet authored
Fix inconsistent highlighting of already selected activity nav-links ## What does this MR do? * Remove edge case where user could deselect an activity nav-link (which seems to be returning all the events) * Explicitly add an `All` tab to return all the events ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Resolves existing UI inconsistency ## Screenshots (if relevant) Before:  After:  ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? * Closes #21631 * Closes #21452 See merge request !6091
-
Rémy Coutable authored
Use gitlab-workhorse 0.8.4 Fixes Go 1.5 compatibility broken in 0.8.3. See merge request !6712
-
Achilleas Pipinellis authored
Link to Registry docs from project settings Add an icon with a link to the docs from the project settings. See merge request !6726
-
Annabel Dunstone Gray authored
Update profile view ## What does this MR do? Centers entire profile information section ## Screenshots (if relevant) Before:  After:  ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] 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 https://gitlab.com/gitlab-org/gitlab-ce/issues/22829 cc @dzaporozhets See merge request !6662
-
Dmitriy Zaporozhets authored
Move user#show and group#show routing under root url ## What does this MR do? Changes routing so user#show and group#show routing is under root url ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? For nice and consistent routing for user/group show pages: | before | after| |---|---| | `/u/dzaporozhets` | `/dzaporozhets`| | `/dzaporozhets/gitlab-ce` |`/dzaporozhets/gitlab-ce`| | `/u/dzaporozhets/snippets` |`/u/dzaporozhets/snippets`| | `/groups/gitlab-org`| `/gitlab-org`| | `/gitlab-org/gitlab-ce`| `/gitlab-org/gitlab-ce`| | `/groups/gitlab-org/issues `| `/groups/gitlab-org/issues `| So show page for user and group shown as `/:name` which is much nicer than before. At same time all nested pages like group issues stays under REST `/groups/:name/issues` so we don't need to introduce extra name restrictions ( ex. case when group has project with name "issues") ## Screenshots (if relevant) ## 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 - [x] All builds are passing - [x] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3620 See merge request !6686
-
Achilleas Pipinellis authored
-
