Commit Graph
57 Commits
Author SHA1 Message Date
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 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
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 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 cb6f035141 Improve pipeline view 2016-04-13 17:05:17 +02:00
Kamil Trzcinski 5d69f5b46d Use Ci::Commit as Pipeline 2016-04-11 23:32:54 +02: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 328b52d58a Some updates after last code review. 2016-02-19 13:14:52 -05:00
Rubén DávilaandRobert Speicher 4dc8350517 Reuser revert commit modal in MR detail page. 2016-02-19 13:14:51 -05:00
Rubén DávilaandRobert Speicher 34e26b8212 Add button to revert commit on Commit detail page. 2016-02-19 13:14:50 -05:00
Rubén DávilaandRobert Speicher 006089f972 Add new endpoint and button to revert any commit. 2016-02-19 13:14:50 -05:00
Dmitriy Zaporozhets bb5213588b Update files/diffs to match new layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 12:31:31 +01:00
Kamil Trzcinski 58a56a0396 Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled 2015-12-17 16:33:47 +01:00
Robert Speicher f49ac5c8d3 Fix clipboard buttons on MR instructions and Commit#show 2015-12-15 16:11:01 -05:00
Grzegorz Bizon b8f67c5e47 Do not display ci build status if builds enabled but no .gitlab-ci.yml
Ref #3827
2015-12-14 11:28:49 +01:00
Robert Speicher bcd89a58e7 Merge branch 'reference-pipeline-and-caching' into 'master'
Implement different Markdown rendering pipelines and cache Markdown

Builds on !1090. 

Related to !1014.

Fixes #2054.

See merge request !1602
2015-12-08 20:22:23 +00:00
Douwe Maan 0dcff1342b Merge branch 'master' into reference-pipeline-and-caching 2015-12-03 13:34:25 +01:00
Douwe Maan 7d3edf2520 Merge branch 'master' into ui/misc 2015-12-03 13:27:39 +01:00
Douwe Maan 8b7dd1c1ce Add clipboard button to commit box SHA 2015-12-02 14:59:33 +01:00
Douwe Maan e718bab9e1 "CI build passed", not "CI build success" 2015-12-02 14:59:25 +01:00
Douwe Maan 854deae412 Brefer "Directory" over "Dir", "Files" over "Code 2015-12-02 14:56:17 +01:00
Douwe Maan f5a630111f Merge branch 'master' into reference-pipeline-and-caching 2015-11-19 15:46:04 +01:00
Jason Lee 18cb430f79 Replace CoffeeScript block into JavaScript in Views.
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
2015-11-10 19:17:37 +08:00
Kamil Trzcinski ba68facf8d CI details cleanup
- Add page titles to CI settings.
- Fix CI admin navigation.
- Remove duplicated scope.
- Use monospace font for commit sha.
- Add page title and header title to build page.
- Proper authorization for cancel/retry builds.
- Use gitlab pagination theme for builds and group members.
- Don't paginate builds widget on build page.
- Add badges to commit page Changes/Builds tabs.
- Add "Builds" to commit Builds tab page title.
- Add and use Ci::Build#retryable? method.
- Add CI::Build#retried? method.
- Allow all failed commit builds to be retried.
- Proper authorization for cancel/retry all builds.
- Remove unused param.
- Use time_ago_with_tooltip where appropriate.
- Tweak builds index text
- Remove duplication between builds/build and commit_statuses/commit_status.
- Use POST rather than GET for canceling and retrying builds.
- Remove redundant URL helpers.
- Add build ID to build page.
- Link branch name on build page.
- Move commit/:sha/ci to commit/:sha/builds.
2015-11-05 15:24:27 +01:00
Douwe Maan ed41333a6e Use Gitlab::Markdown.render with :pipeline option rather than different methods 2015-10-14 19:28:09 +02:00
Dmitriy Zaporozhets 9c4307e287 Show CI status on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 11:21:39 +02:00
Dmitriy Zaporozhets 70aecc34cf Improve commit page style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-08 15:40:14 +02:00
Dmitriy Zaporozhets 5f3a758721 Merge branch 'fix-plain-diffs' into 'master'
Remove the email patches link for merge commits

Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches.  This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit.  Together these changes should prevent the 500 errors described in the issue.

cc @sytse

See merge request !1737
2015-03-29 10:32:27 +00:00
Dmitriy Zaporozhets 8b7aedad2b Prevent doubling AJAX request with each commit visit via Turbolink 2015-03-25 15:47:31 -07:00
Vinnie OkadaandVinnie Okada 49c3cc85c4 Remove the email patches link for merge commits
Rugged's `to_mbox` method doesn't work for merge commits, so don't
display the option to download merge commits as email patches.
2015-03-23 22:21:40 -06:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Valery Sizov b9d9ac82a9 Commit page: async load branches info
Conflicts:
	config/routes.rb
2015-02-03 09:10:56 -08:00
Dmitriy Zaporozhets 7411fb36c5 Show branches/tags as labels on commit page 2015-01-22 11:15:21 -08:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +01:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
Sullivan SENECHAL c0e2eee38b Fix fa-download icon 2014-10-04 16:58:59 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
skv 3d7b79e454 whitespaceses at beginning of commit messages 2014-08-14 15:19:44 +04:00
Dmitriy Zaporozhets f84d015fa9 Fix commit comment count css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 23:09:43 +02:00
Dmitriy Zaporozhets 7157f79caa Refactor js behaviours helpers
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-11 15:15:08 +02:00
Dmitriy Zaporozhets 8064b3b767 Fix btn margin for commit show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 16:18:47 +02:00
Dmitriy Zaporozhets f92b1f3d01 Use more specific class names: grouped -> btn-grouped
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-20 13:05:33 +02:00
Dmitriy Zaporozhets 9a31844e2a Remove unnecessary ago keyword
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:49:22 +02:00