summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added lock/unlock issue discussion widget into right sidebar.lock-issue-discussionFatih Acet2016-08-104-1/+46
|
* Added vue.js.Fatih Acet2016-08-101-0/+10073
|
* Merge branch 'link-to-gdk-howtos' into 'master' Achilleas Pipinellis2016-08-101-1/+1
|\ | | | | | | | | | | | | Link to doc root, not readme of GDK I hope this makes navigation between gitlab-ce developer docs and GDK docs more smooth. See merge request !5716
| * Link to doc root, not readme of GDKJacob Vosmaer2016-08-081-1/+1
| |
* | Merge branch 'api-examples-curl-long-options' into 'master' Achilleas Pipinellis2016-08-1046-673/+696
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use long options for curl examples in documentation ## What does this MR do? Use long options (e.g. `--header` instead of `-H`) for curl examples in documentation. ## Why was this MR needed? Short options are less readable. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5465#note_13603730 See merge request !5703
| * | use Unix line endings for API documentationwinniehell2016-08-091-514/+514
| | |
| * | use long options for curl examples in API documentation (!5703)winniehell2016-08-0944-161/+162
| | |
| * | add linting script for documentationwinniehell2016-08-092-0/+22
| | |
* | | Merge branch 'default-label-documentation' into 'master' Achilleas Pipinellis2016-08-103-10/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify the features for generating default label sets ## What does this MR do? * Split out the information regarding the label set that GitLab can generate * Add information for the labels view in the Admin panel ## Are there points in the code the reviewer needs to double check? * Please ensure that the newly added section relating to the Admin area seems relevant * Please verify adherence to the documentation styleguide ## Why was this MR needed? Documentation regarding default label sets was missing ## What are the relevant issue numbers? Closes #1865 See merge request !5736
| * | | Clarify the features for generating default label setsMark Fletcher2016-08-093-10/+31
| | | | | | | | | | | | | | | | | | | | * Split out the information regarding the label set that GitLab can generate * Add information for the labels view in the Admin panel
* | | | Merge branch 'rs-rename-run-helper' into 'master' Douwe Maan2016-08-104-17/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `run` task helper method to prevent conflict with StateMachine This prevents the following message from appearing whenever running a Rake task: Instance method "run" is already defined in Object, use generic helper instead or set StateMachines::Machine.ignore_method_conflicts = true. See merge request !5750
| * | | | Rename `run` task helper method to prevent conflict with StateMachineRobert Speicher2016-08-094-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the following message from appearing whenever running a Rake task: Instance method "run" is already defined in Object, use generic helper instead or set StateMachines::Machine.ignore_method_conflicts = true.
* | | | | Merge branch 'add-caching-for-project-count' into 'master' Robert Speicher2016-08-093-0/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a method in Project to return a cached value of total count of projects This is in preparation to address the DB load caused by the counting in gitlab-com/infrastructure#303. See merge request !5746
| * | | | | Add a method in Project to return a cached value of total count of projectsStan Hu2016-08-093-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation to address the DB load caused by the counting in gitlab-com/infrastructure#303.
* | | | | | Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files'Douwe Maan2016-08-094-15/+39
|\ \ \ \ \ \
| * | | | | | Update tree view to sort folders with submodulesAdam Buckland2016-08-094-15/+39
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently trees are sorted in the fashion: - folders - files - submodules with each section sorted alphabetically This changes to this system: - folders and submodules (sorted together) - files
* | | | | | Merge branch 'gh-pull-requests' into 'master' Douwe Maan2016-08-0910-177/+81
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check out GH pull requests locally where the source/target branch had been deleted ## What does this MR do? Check out GitHub pull requests where source/target branches that had been deleted locally rather than temporarily restoring them on GitHub using their References API. This helps us to not get rate limited, and allow us to import cross-repository pull requests (those from forks). ## What are the relevant issue numbers? Fixes #15528 Fixes #17766 Fixes #19310 Fixes #19439 Fixes #19998 Fixes #20153 Fixes #20552 Fixes https://gitlab.com/gitlab-com/support-forum/issues/801 #20385 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] ~~API support added~~ - Tests - [x] Added for this feature/bug - [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) See merge request !5630
| * | | | | | Prefixes removed branches name with PR number when importing PR from GHgh-pull-requestsDouglas Barbosa Alexandre2016-08-084-14/+51
| | | | | | |
| * | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-08-081-0/+1
| | | | | | |
| * | | | | | Remove SHA suffix for removed branches name when importing PR from GHDouglas Barbosa Alexandre2016-08-083-36/+28
| | | | | | |
| * | | | | | Allow users to import cross-repository pull requests from GitHubDouglas Barbosa Alexandre2016-08-043-12/+5
| | | | | | |
| * | | | | | Does not need to disable GitHub webhooks since PRs are check out locallyDouglas Barbosa Alexandre2016-08-044-123/+0
| | | | | | |
| * | | | | | Check out locally PRs where the source/target branch were removedDouglas Barbosa Alexandre2016-08-041-7/+11
| | | | | | |
* | | | | | | Merge branch 'brodock/gitlab-ce-feature/redis-sentinel'Douwe Maan2016-08-0916-121/+604
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/gitlab/redis.rb
| * | | | | | Small refactor in Redis class and improved specsGabriel Mazetto2016-08-064-9/+16
| | | | | | |
| * | | | | | Small refactor and a few documentation fixesGabriel Mazetto2016-08-044-7/+7
| | | | | | |
| * | | | | | Added Redis sentinel support to the CHANGELOGGabriel Mazetto2016-08-041-0/+1
| | | | | | |
| * | | | | | Updated documentations for Redis Sentinel experimental supportGabriel Mazetto2016-08-041-23/+28
| | | | | | |
| * | | | | | Refactor Redis HA docs to also include SentinelAchilleas Pipinellis2016-08-041-102/+245
| | | | | | |
| * | | | | | Added Redis Sentinel support documentationGabriel Mazetto2016-08-042-1/+108
| | | | | | |
| * | | | | | Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-08-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a comment to remember developers to open merge request to omnibus in future changes of the file.
| * | | | | | Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-043-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in resque.yml.example Codestyle changes
| * | | | | | Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-08-043-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some codestyle changes
| * | | | | | Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-044-30/+27
| | | | | | |
| * | | | | | Reverted resque.yml -> redis.yml renamingGabriel Mazetto2016-08-041-1/+1
| | | | | | |
| * | | | | | Make sidekiq get config settings from Gitlab::RedisConfigGabriel Mazetto2016-08-041-8/+6
| | | | | | |
| * | | | | | Specs for RedisConfigGabriel Mazetto2016-08-046-1/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure :url is not present on RedisConfig.params after parsing
| * | | | | | Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-047-65/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We will trust redis configuration params loading to Gitlab::RedisConfig.
* | | | | | | Merge branch 'relative-link-filter-ref' into 'master' Robert Speicher2016-08-092-5/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not look up commit again when it is passed to RelativeLinkFilter ## What does this MR do? Use `context[:commit]` in RelativeLinkFilter instead of looking up commit using `context[:ref]`. ## Why was this MR needed? Even though the commit object was already passed, unnecessary I/O is done to retrieve the commit object. ## What are the relevant issue numbers? Fixes #20026 See merge request !5455
| * | | | | | Do not look up commit again when it is passed to RelativeLinkFilter (!5455)winniehell2016-08-021-3/+3
| | | | | | |
| * | | | | | Add failing test for #20026winniehell2016-08-021-2/+18
| | | | | | |
* | | | | | | Merge branch 'group-icon-alignment' into 'master' Jacob Schatz2016-08-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align visibility icons on group page ## What does this MR do? Aligns visibility icons on group page ## Why was this MR needed? Because the icons looked like this: ![Screen_Shot_2016-07-25_at_3.03.31_PM](/uploads/94205a609f803a36a7ba678332564c48/Screen_Shot_2016-07-25_at_3.03.31_PM.png) Now it looks like this: ![Screen_Shot_2016-07-25_at_3.06.29_PM](/uploads/efbf40105d91d05c8cf81761aa27c618/Screen_Shot_2016-07-25_at_3.06.29_PM.png) See merge request !5482
| * | | | | | | Align visibility icons on group pagegroup-icon-alignmentAnnabel Dunstone2016-07-251-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'coffeescript-coverage' into 'master' Robert Speicher2016-08-093-4/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JavaScript coverage analysis ## What does this MR do? - configure teaspoon to calculate test coverage of JavaScript files - publish result as GitLab pages ## Why was this MR needed? - test coverage was not calculated for JavaScript files - JavaScript wants to be under cover :dark_sunglasses: ## What are the relevant issue numbers? #19412 See merge request !5052
| * | | | | | | | Add test coverage analysis for CoffeeScript (!5052)winniehell2016-08-073-4/+15
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/import-mr-source' into 'master' Robert Speicher2016-08-094-9/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importing with an invalid MR source project Source project shouldn't be -1 when both source and target are the same in the original export. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20611 See merge request !5679
| * | | | | | | | | fix MR source project assignmentfix/import-mr-sourceJames Lopez2016-08-094-9/+34
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-broadcast-message-factory-date-range' into 'master' Robert Speicher2016-08-091-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TST: Use more accurate time windows so tests do not fail This MR sets the Datetime attributes of the of the broadcast messages factory more precisely. This MR is necessary to ensure that all specs which use the broadcast message factory will pass when run anywhere at any time. Currently, the way the 'starts_at' and 'ends_at' attributes are set,if the specs are run at one second to midnight, the broadcast message will expire in one second. I have changed it so that we are guaranteed a period of one day until expiration. I believe this is the desired behaviour and it's also consistent with the rest of the factory. See merge request !5674
| * | | | | | | | | TST: Use more accurate time windows so tests do not failjoshbabier2016-08-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the way the 'starts_at' and 'ends_at' attributes are set, if the specs are run at one second to midnight, the broadcast message will expire in one second. I have changed it so that we are guaranteed a period of one day until expiration. I believe this is the desired behaviour and it's also consistent with the rest of the factory. This corrects the following three specs that can fail depending upon where and when they are run: ./spec/helpers/broadcast_messages_helper_spec.rb:42 ./spec/models/broadcast_message_spec.rb:26 ./spec/models/broadcast_message_spec.rb:47
* | | | | | | | | | Merge branch 'avoid-constant-warnings-in-rails' into 'master' Robert Speicher2016-08-092-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails prefers require_dependency so that it won't require twice: ## What does this MR do? Fix warnings for loading constants twice ## Are there points in the code the reviewer needs to double check? Now it's depending on `require_dependency`. ## Why was this MR needed? Fixes #20724 Backtrace before this patch: $23876 See merge request !5727