Commit Graph

628 Commits

Author SHA1 Message Date
Sam Rose 1ebd9dad8e Add confirm delete protected branch modal 2017-05-08 07:41:58 +00:00
Zeger-Jan van de Weg 8df3997a92 Add Pipeline Schedules that supersedes experimental Trigger Schedule 2017-05-07 22:35:56 +00:00
Z.J. van de Weg e0e52fe582 Fix test| 2017-05-07 18:26:39 +02:00
Kamil Trzcinski c195b313ad
Make test that actually displays pipeline graph 2017-05-07 14:09:21 +02: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
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
Jacob Schatz aa874a1cd6 Merge branch 'mia_backort' into 'master'
Backport of Multiple Assignees feature

See merge request !11089
2017-05-05 19:17:28 +00:00
Michael Kozono fc061c2ecd Fix Rubocop failures 2017-05-05 12:12:49 -07:00
Michael Kozono e8f2a7007a Fix or workaround spec failure
Not sure why this fixes this error:

```
ActiveRecord::RecordNotUnique:
       PG::UniqueViolation: ERROR:  duplicate key value violates unique constraint "index_routes_on_source_type_and_source_id"
       DETAIL:  Key (source_type, source_id)=(Project, 1) already exists.
       : INSERT INTO "routes" ("source_type", "path", "name", "source_id", "created_at", "updated_at") VALUES ($1, $2, $3, $4, $5, $6) RETURNING "id"
```
2017-05-05 12:11:58 -07:00
Michael Kozono 7d02bcd2e0 Redirect from redirect routes to canonical routes 2017-05-05 12:11:57 -07:00
Michael Kozono f4a2dfb46f Add happy path feature tests for redirect behavior 2017-05-05 12:11:57 -07:00
Phil Hughes 9caa7e7a54 Merge branch '24883-build-failure-summary-page' into 'master'
Build failures summary page for pipelines

Closes #24883

See merge request !10719
2017-05-05 18:58:01 +00:00
James Edwards-Jones acd9cd0906 Hides pipeline ‘Failed Jobs’ tab when no jobs have failed 2017-05-05 15:41:36 +01:00
James Edwards-Jones 4c0adb9ee9 Build failures summary page for pipelines 2017-05-05 15:01:50 +01: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
Luke "Jared" Bennett 41d0f23108 Resolve "Web GUI: Unable to create new branch from commit SHA" 2017-05-04 18:49:56 +00: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
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
Phil Hughes f29e5d4d93 Merge branch 'master' into deploy-keys-load-async 2017-05-03 17:04:47 +01:00
Douwe Maan 720cc14a75 Refactor Blob support of external storage in preparation of job artifact blobs 2017-05-03 10:20:05 -05: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
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
Sean McGivern a49d5271fb Merge branch 'pdf-test-fix' into 'master'
Fixed PDF blob specs

See merge request !11025
2017-05-02 12:19:33 +00:00
Dmitriy Zaporozhets aaf37ead92 Merge branch '19364-webhook-edit' into 'master'
Implement ability to update hooks

Closes #19364

See merge request !10816
2017-05-02 11:44:58 +00:00
Phil Hughes 0c83f747ec Fixed PDF blob specs
The PDF file is no longer included in the repo, so we need to create the PDF before running the tests
2017-05-02 10:37:57 +01:00
Grzegorz Bizon d276ea9372 Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (314 commits)
  Better Explore Groups view
  Update Carrierwave and fog-core
  Add specs for Gitlab::RequestProfiler
  Add scripts/static-analysis to run all the static analysers in one go
  Shorten and improve some job names
  Group static-analysis jobs into a single job
  Don't blow up when email has no References header
  Update CHANGELOG.md for 9.1.2
  Add changelog
  Add changelog
  Show Raw button as Download for binary files
  Use blob viewers for snippets
  Fix typo
  Fixed transient failure related to dropdown animations
  Revert "Merge branch 'tc-no-todo-service-select' into 'master'"
  fix link to MR 10416
  Another change from .click -> .trigger('click') to make spec pass
  Change from .click -> .trigger('click') to make spec pass
  Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations
  Add AddColumnWithDefaultToLargeTable cop
  ...

Conflicts:
	spec/requests/api/jobs_spec.rb
2017-05-02 10:40:10 +02:00
Phil Hughes 54beb93ac3 Merge branch 'pdflab-in-repo' into 'master'
Move PDFLab assets into repo

See merge request !10642
2017-05-02 07:35:49 +00:00
Douwe Maan 2b3fc5e624 Add download button to project snippets 2017-04-30 17:52:49 -05:00
Douwe Maan 54040ce066 Show Raw button as Download for binary files 2017-04-30 14:06:21 -05:00
Douwe Maan 60ebd101d0 Use blob viewers for snippets 2017-04-30 11:21:20 -05:00
Phil Hughes 357ab10da3 Fixed some spinach & rspec tests 2017-04-28 20:59:20 +01:00
Sam Rose 9f3985c613 Move PDFLab into GitLab 2017-04-28 12:52:36 -04:00
Luke "Jared" Bennett 77d924057b
add issues and merge-requests classes and use to find in rspec 2017-04-28 13:29:47 +01:00
Alexander Randa c504b88f07 Implement ability to update hooks 2017-04-28 11:49:57 +00:00
Douwe Maan 87a3bd26fa Address feedback 2017-04-27 12:23:27 -05:00
Douwe Maan 964e7d206b Add specs 2017-04-27 12:23:26 -05:00
Douwe Maan a7fd95cd22 Render viewer error synchronously so that 'view the source' link will work 2017-04-27 12:23:26 -05:00
Douwe Maan a6536a84e7 Fix some specs 2017-04-27 12:23:26 -05:00
Douwe Maan 7cc4546bc9 Add specs 2017-04-27 12:23:26 -05:00
Sean McGivern 976b020aa3 Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master'
Resolve "Milestone sidebar display incorect number of MR when minimized"

Closes #31292

See merge request !10933
2017-04-27 16:10:32 +00:00
Zeger-Jan van de Weg df85a7c004 Submodule Dockerfile templates 2017-04-26 15:57:44 +00:00
Clement Ho 2bde344217 Merge branch '22826-ui-inconsistency-different-files-views-find-file-button-missing' into 'master'
[#22826] Ensure find_file_link and download button is part of file tree header

Closes #22826

See merge request !9847
2017-04-26 13:13:02 +00:00
Luke "Jared" Bennett 27317d55b0
Added test 2017-04-26 11:02:32 +01:00
TM Lee d2765b453f [#22826] Add newline before expect in accordance to four phase thoughtbot style 2017-04-25 08:45:30 +08:00
Rémy Coutable 3855751d02
Merge branch 'jacopo-beschi/gitlab-ce-29712-unnecessary-wait-for-ajax'
See merge request !10567

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-04-24 18:06:47 +02:00
TM Lee 7940a5d49c [#22826] Ensure find_file_link and download button is part of file tree header
- Move the find_file_link and download partial into the project tree_header partial
- Added Changelog
2017-04-23 18:44:42 +08:00
Grzegorz Bizon 8c8f6db457 Merge branch 'master' into feature/gb/manual-actions-protected-branches-permissions
* master: (274 commits)
  Update VERSION to 9.2.0-pre
  Update CHANGELOG.md for 9.1.0
  Update Auto Deploy documentation
  Disable import URL field in New project form since it's hidden by default
  Remove reference to burndown charts since they don't exist for ce.
  Use master_password for Sentinel
  Refactor Discussions docs
  Start versioning cached markdown fields
  Refactor add_users method for project and group
  Improved the spec Now correctly tests against different forms
  Refactor environments components into vue files - part 3
  Adding animation for all dropdown
  fix placeholder visibility
  submodule_links: handle urls that don't end with .git
  Add help regarding vue resource and where to include it
  Append .json to ajax endpoint to prevent browser to display raw json
  Fixed the preview keyboard shortcut focusing wrong tab
  Fix broken link
  Added new discussions docs
  Started on resolvable discussions docs
  ...
2017-04-22 21:01:50 +02:00