Commit Graph

1086 Commits

Author SHA1 Message Date
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Zeger-Jan van de Weg 8df3997a92 Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
Kamil Trzciński 6ad3814e1b Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into 'master'
Check access to a branch when user triggers manual action

Closes #20261

See merge request !10494
2017-05-06 17:17:02 +00:00
Zeger-Jan van de Weg c17e6a6c68 Real time pipeline show action 2017-05-06 16:45:46 +00:00
Sean McGivern 56fb7823f9 Merge branch '17361-redirect-renamed-paths' into 'master'
Resolve "Redirect to new project link after a rename"

Closes #17361 and #30317

See merge request !11136
2017-05-06 05:45:56 +00:00
Sean McGivern 143d88d5e6 Merge branch 'fix/admin-integrations' into 'master'
Fix new admin integrations not taking effect on existing project

Closes #26376

See merge request !11069
2017-05-05 22:01:43 +00:00
Michael Kozono f05469f99b Resolve discussions 2017-05-05 12:12:50 -07:00
Michael Kozono 9e48f02ea8 Dry up routable lookups. Fixes #30317
Note: This changes the behavior of user lookups (see the spec change) so it acts the same way as groups and projects. Unauthenticated clients attempting to access a user page will be redirected to login whether the user exists and is publicly restricted, or does not exist at all.
2017-05-05 12:12:50 -07:00
Michael Kozono e4bcc90d95 Add “project moved” flash message on redirect 2017-05-05 12:12:50 -07:00
Michael Kozono 0c866f4a57 Resolve discussions 2017-05-05 12:12:49 -07:00
Michael Kozono fc061c2ecd Fix Rubocop failures 2017-05-05 12:12:49 -07:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
James Lopez 6ecf16b8f7 refactor code based on feedback 2017-05-05 18:01:33 +02:00
Valery Sizov 5004579b15 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci skip] 2017-05-05 16:59:31 +03:00
Grzegorz Bizon b6facd8313 Merge commit '3a2b60f7' from 'master'
* commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits)
  Fixed Karma spec
  Reject EE reserved namespace paths in CE as well
  Updated webpack config
  Include the bundler:audit job into the static-analysis job
  Document serializers
  Add artifact file page that uses the blob viewer
  Pipeline table mini graph dropdown remains open when table is refreshed
  Adds off for event hub
  Compile gitlab-shell go executables
  Allow to create new branch and empty WIP merge request from issue page
  Moved to a view spec
  Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md
  Convert seconds to minutes and hours on chat notifations
  Disable navigation to Pages config if Pages is disabled
  Sort the network graph both by commit date and topographically.
  Add tooltips to note action buttons
  Add breadcrumb, build header and pipelines submenu to artifacts browser
  Update todos screenshots
  removes the possibility of commit messages having carriage returns
  Handle incoming emails from aliases correctly
  ...
2017-05-05 12:22:46 +02:00
Grzegorz Bizon 4f3dc19aaf Add specs for new pipeline action for JSON format 2017-05-05 09:32:13 +02:00
Filipa Lacerda 7a66cd688a Merge branch 'deploy-keys-load-async' into 'master'
Deploy keys load async

Closes #29667

See merge request !10973
2017-05-04 18:30:41 +00:00
James Lopez cf002738e7 refactor a few things based on feedback 2017-05-04 18:11:28 +02:00
Sean McGivern d3768dd796 Merge branch 'dm-artifact-blob-viewer' into 'master'
Use blob viewer for job artifacts

Closes #31297

See merge request !11018
2017-05-04 15:01:54 +00:00
Phil Hughes 79f40f27fd Merge branch 'master' into deploy-keys-load-async 2017-05-04 15:54:16 +01:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Douwe Maan 0f58eb6bde Add artifact file page that uses the blob viewer 2017-05-04 08:50:12 -05:00
Sean McGivern ba608dc0f2 Merge branch '12910-uploader-pers-snippet' into 'master'
Prepare uploaders for personal snippets comments

See merge request !11022
2017-05-04 10:47:10 +00:00
Rémy Coutable ef71bf6278 Merge branch '30529-remove-pages-tab-if-pages-isn-t-enabled' into 'master'
Disable navigation to Pages config if Pages is disabled

Closes #30529

See merge request !11008
2017-05-04 09:27:52 +00:00
Alfredo Sumaran b64a37c4ed Allow to create new branch and empty WIP merge request from issue page 2017-05-04 08:09:21 +00:00
Mark Fletcher 3ce95e7c16 Disable navigation to Pages config if Pages is disabled
* Regards project-level pages config
- Nav link is now shown only if Pages is enabled for instance
- Navigation to following controllers denied if Pages disabled:
  * projects/pages_controller
  * projects/pages_domains_controller
- 'disabled' partial removed
+ Test for pages_controller introduced
2017-05-04 14:11:40 +08:00
Phil Hughes f29e5d4d93 Merge branch 'master' into deploy-keys-load-async 2017-05-03 17:04:47 +01:00
Jacob Schatz c45e11f179 Merge branch 'async-milestone-tabs' into 'master'
Load milestone tabs asynchronously

See merge request !10919
2017-05-03 15:15:20 +00:00
Grzegorz Bizon 72307940bb Improve code style related to protected actions 2017-05-03 12:32:39 +02:00
Grzegorz Bizon 738bf2c238 Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (103 commits)
  Include missing project attributes to Import/Export
  Create the rest of the wiki docs
  Fill in information about creating the wiki Home page
  Move wiki doc to its own index page
  Create initial file for Wiki documentation
  Default to null user when asignee is unselected
  Re-enable ref operations with gitaly after not-found fix
  #31560 Add repo parameter to gitaly:install and workhorse:install
  Remove N+1 queries when checking nodes visible to user
  Don't validate reserved words if the format doesn't match
  Revert "Shorten and improve some job names"
  Remove unused initializer
  DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml`
  Make the static-analysis job be run for docs branches too
  Add download_snippet_path helper
  Refresh the markdown cache if it was `nil`
  Add some documentation for the new migration helpers
  Update comments
  Display comments for personal snippets
  Update docs on creating a project
  ...
2017-05-03 12:27:30 +02:00
Douwe Maan 2a73f0a638 Merge branch 'rs-described_class-cop-2' into 'master'
Enable `RSpec/DescribedClass` cop and correct violations

See merge request !10930
2017-05-02 22:30:30 +00:00
Douwe Maan d048d9268c Merge branch 'metrics-deployment-history' into 'master'
Metrics deployment history

Closes #26914

See merge request !10649
2017-05-02 16:56:49 +00:00
Sean McGivern c5dee301f8 Merge branch 'dm-snippet-download-button' into 'master'
Add download button to project snippets

See merge request !11004
2017-05-02 15:25:26 +00:00
Jarka Kadlecova 43ff738641 Support uploaders for personal snippets comments 2017-05-02 15:22:24 +02:00
Jarka Kadlecova 8c3a03c1b9 Display comments for personal snippets 2017-05-02 13:07:53 +02:00
Grzegorz Bizon eb45582f55 Fix builds controller spec related to protected actions 2017-05-02 12:25:30 +02:00
Robert Speicher d49768296c Auto-correct `RSpec/DescribedClass` violations 2017-05-01 11:13:33 -04:00
Douwe Maan 2b3fc5e624 Add download button to project snippets 2017-04-30 17:52:49 -05:00
Robert Speicher 2952a44779 Merge branch 'enable-spec-file-name-cop' into 'master'
Enable RSpec/FilePath cop

Closes #31316

See merge request !10911
2017-04-28 18:02:17 +00:00
Rémy Coutable 93e83afb39 Merge branch 'dz-add-oauth-controller-spec' into 'master'
Add tests for Oauth::AuthorizationsController

See merge request !10982
2017-04-28 15:05:06 +00:00
Phil Hughes 79e2a524e2 Merge branch 'master' into deploy-keys-load-async 2017-04-28 14:46:58 +01:00
Dmitriy Zaporozhets c277b2c34d
Add tests for Oauth::AuthorizationsController
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-04-28 15:45:18 +03:00
Dosuken shinya 73ac7b2dd6 Resolve "Add more tests for spec/controllers/projects/builds_controller_spec.rb" 2017-04-28 09:38:32 +00:00
Jacob Schatz 57f8be4e69 Merge remote-tracking branch 'origin/29667-deploy-keys' into deploy-keys-load-async 2017-04-27 16:40:27 -04:00
Douwe Maan 5976195fef Merge branch '31138-improve-test-settings-for-services-in-empty-projects' into 'master'
improves test settings for chat notification services for empty projects

Closes #31138

See merge request !10886
2017-04-27 19:16:31 +00:00
Tiago Botelho 6368072fd7 improves test settings for chat notification services for empty projects 2017-04-27 18:36:10 +01:00
Sean McGivern 8fbda3bf15 Merge branch '12910-personal-snippet-prep-2' into 'master'
Support preview_markdown action for personal_snippets

See merge request !10810
2017-04-26 12:36:25 +00:00
Sean McGivern 5069682d8e Enable RSpec/FilePath cop
- Ignore JS fixtures
- Ignore qa directory
- Rewrite concern specs to put concern name first
2017-04-26 12:50:32 +01:00
Phil Hughes 4b812d979e Fixed failing specs 2017-04-26 12:23:29 +01:00
Phil Hughes 480fcb5533 Added controller specs 2017-04-26 12:23:29 +01:00