137 Commits
Author SHA1 Message Date
Douwe Maan a9fa45f09e Represent DiffRefs as proper class instead of tuple array 2016-07-06 18:50:58 -04:00
Annabel Dunstone 47e5b5397e Get rid of pluralize on stage names 2016-07-06 11:09:28 -05:00
Phil Hughes 1a259bc644 Fixed issue with dropdown buttons 2016-06-17 09:49:50 +01:00
Jacob SchatzandPhil Hughes a7a504157f Use line-height instead of height. 2016-06-17 09:49:05 +01:00
Sean McGivern b997752539 Only show branches for revert / cherry-pick
Tags are immutable, so we can't add a commit to either revert or
cherry-pick another commit to them.
2016-06-13 11:05:22 +01:00
Kamil Trzcinski 1927a2d30b Rename all ci_commit[s] in application code to pipeline[s] 2016-06-03 16:27:50 +02:00
Kamil Trzcinski 08baa9983e Use pipelines in context of Project 2016-06-03 13:34:03 +02:00
Douwe Maan 2d084dd848 Merge branch 'separate-banzai-references' into 'master'
Separate reference gathering from rendering

This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.

cc @rspeicher @DouweM 

See merge request !3969
2016-06-01 15:51:59 +00:00
Grzegorz Bizon d133175b39 User internal pipeline to access project in views 2016-06-01 12:01:49 +02:00
Robert Speicher 03f26a4091 Merge branch 'remove-unnecessary-titles' into 'master'
Remove header title from project pages

With new navigation design it makes no sense to duplicate title in the header.

See merge request !4304
2016-05-26 20:18:21 +00:00
Phil Hughes 6b5c3f09fd Improved mobile styling 2016-05-26 17:15:22 +01:00
Dmitriy Zaporozhets cdcb354f17 Remove header title from project pages
With new navigation design it makes no sense to duplicate title in the
header

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-26 17:58:44 +02:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
2016-05-26 17:14:06 +02:00
Phil Hughes 2830b46cbc Reduced number of buttons in commit header
Closes #17576
2016-05-26 11:19:11 +01:00
Kamil Trzcinski 2f252d8f0e Merge branch 'master' into improve-pipeline-design 2016-05-23 21:23:32 -05:00
Annabel Dunstone e8f869f96b Revert commit info change 2016-05-23 12:04:55 -05:00
Annabel Dunstone 27a5a4e430 Put column headers back 2016-05-23 09:46:06 -05:00
Annabel Dunstone 9c1b3d88db Move build info out of pipeline conditional 2016-05-23 09:30:54 -05:00
Kamil Trzcinski 1cbc898223 Improve design of Pipeline view 2016-05-21 01:17:33 -05:00
Kamil Trzcinski 4f1c636831 Create pipeline objects with parameters 2016-05-18 17:01:42 -05:00
Kamil Trzcinski 5194a9d9f6 Improve the pipeline box 2016-05-16 23:29:11 -05:00
Kamil Trzcinski 7657d20216 Improve design of commit_box with status of builds and pipelines 2016-05-16 17:09:04 -05:00
Kamil Trzcinski bf4dc75801 Improve the pipelines design 2016-05-16 16:48:27 -05:00
Kamil Trzcinski 0d43b92706 Fix CI tests 2016-05-12 13:08:18 -05:00
Kamil Trzcinski 86cedb0825 Use pipeline permissions instead of build 2016-05-10 02:41:18 +03:00
Kamil Trzcinski 504a1fac95 Fix SQL queries for calculating stages status 2016-05-10 00:58:53 +03:00
Kamil Trzcinski 7c1acb022a Merge remote-tracking branch 'origin/master' into with-pipeline-view
# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml
2016-05-09 23:53:02 +03:00
Kamil Trzcinski 1ad0c968d5 Make a build views nicer 2016-05-09 23:39:48 +03:00
Annabel Dunstone 8d19955c05 Revert counter parentheses back to badges 2016-05-04 17:07:47 -05:00
Annabel Dunstone fc20639c8d Builds page redesign 2016-05-04 16:45:37 -05:00
Annabel Dunstone 7878eb9fa6 Start builds redesign 2016-05-04 16:45:37 -05:00
Kamil Trzcinski cb90368a69 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-04-26 16:36:17 +02:00
Kamil Trzcinski c6f19aed51 Fix builds rendering bug 2016-04-26 16:36:06 +02:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet
Closes #15509
2016-04-25 17:19:57 +02:00
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master'
Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653
2016-04-21 08:10:37 +00:00
P.S.V.R 3d6ba3b107 Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-18 15:39:07 +08:00
Kamil Trzcinski dc0d7f1a9b Revert unneeded changes 2016-04-16 21:47:10 +02:00
Kamil Trzcinski 0b1655e7b2 Rename CiStatus to Statusable 2016-04-16 21:46:26 +02:00
Kamil Trzcinski cb6f035141 Improve pipeline view 2016-04-13 17:05:17 +02:00
Kamil Trzcinski 410f2b40f2 Remove unneeded changes 2016-04-13 16:39:23 +02:00
Kamil Trzcinski ed3f267497 Merge branch 'ci-commit-as-pipeline' into with-pipeline-view
* ci-commit-as-pipeline: (131 commits)
  Optimise Merge Request builds rendering
  Fix migrations on MySQL
  Update db/schema.rb
  Cleanup changes
  Cleanup required migrations
  Add indexes concurrently on PostgreSQL
  Fix CiStatus implementation and tests
  Fix group_member_spec to not leak information
  Fix doc for moving an issue
  Update tests for moving issues via API
  Tie example config to JIRA screenshot
  API: Ability to move an issue
  Added ability to add custom tags to transactions
  API: Avoid group leak while updating the group
  API: Return 404 if user does not have access to group
  Move 'New branch from issue' feature doc to web_editor.md
  Fix repository cache invalidation issue when project is recreated with an empty repo
  improve formatting
  Add `Gitlab.com?` method
  (doc) fix typo to ssh keys doc url
  ...

Conflicts:
	app/controllers/projects/pipelines_controller.rb
	app/helpers/ci_status_helper.rb
	app/helpers/gitlab_routing_helper.rb
	app/views/projects/ci/commits/_commit.html.haml
	app/views/projects/commit/_ci_commit.html.haml
2016-04-13 16:38:24 +02:00
Kamil Trzcinski 9e68109f2d Optimise Merge Request builds rendering 2016-04-13 16:32:42 +02:00
Kamil Trzcinski f5d24e60f8 Pipeline view 2016-04-13 13:01:08 +02:00
Kamil Trzcinski 5d69f5b46d Use Ci::Commit as Pipeline 2016-04-11 23:32:54 +02:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
2016-03-14 13:20:35 +01:00
Rubén DávilaandRobert Speicher 169070ba4b Some updates from last code review. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d958d027dc Make #commit_with_hooks return the new obj id plus some other fixes. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher d34733efc4 Don't show revert button if commit/MR has already been reverted. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher e8d15f1339 Refactor revert_commit_link helper. 2016-02-19 13:14:54 -05:00
Rubén DávilaandRobert Speicher 5ad78cdbda Use a custom title in the revert modal. 2016-02-19 13:14:53 -05:00