home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,219 Commits 48 Branches 340 Tags
b2dc9176018729efc1969035b30017c2ed81a708
Commit Graph
65 Commits
Author SHA1 Message Date
Phil Hughes 41c2ea9b7a Vertical alignment of buttons in commit row 2016-06-08 10:11:44 +01:00
Phil Hughes e5a83a9a94 Added short commit ID to mobile 2016-06-08 10:11:44 +01:00
Phil Hughes d5afb1324f Sends correct parameter to commit_author_link for avatar 2016-06-08 10:11:44 +01:00
Phil Hughes 97cee7e231 Improved spacing on mobile 2016-06-08 10:11:44 +01:00
Phil Hughes 8b40a7745b Updated tests 2016-06-08 10:10:18 +01:00
Phil Hughes 79b375e178 Updated some commit UI colors 
Fixed issue with tree view styles
 2016-06-08 10:10:18 +01:00
Phil Hughes 8827eea864 Updated commits UI 
Closes #14633
 2016-06-08 10:10:18 +01: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
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
Felipe Artur f26a6da62c Render relative timestamps for all commits in projects commit list 2016-04-19 12:09:06 -03:00
Kamil Trzcinski 065e0c0fe4 Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 
# Conflicts:
#	db/schema.rb
 2016-04-16 19:55:14 +02:00
Phil Hughes 970b2ed9da Updated MR compare 
Based on in feedback in !3228
 2016-04-13 16:10:03 +01:00
Kamil Trzcinski c351b9f599 Improve rendered CI statuses 2016-04-13 16:51:52 +02:00
Kamil Trzcinski 52be9e20f9 Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 
# Conflicts:
#	app/views/projects/commits/_commit.html.haml
 2016-04-11 23:33:50 +02:00
Kamil Trzcinski 5d69f5b46d Use Ci::Commit as Pipeline 2016-04-11 23:32:54 +02:00
Phil Hughes 017ed4ae37 Fixed builds 2016-04-06 12:52:07 +01:00
Phil Hughes c5c05f6a04 Updated UI for new merge request 
Closes #2540
 2016-04-06 11:08:40 +01:00
Rémy Coutable ef3d5a2712 Replace strong by span for .item-title elements 2016-01-15 15:46:01 +01:00
Rémy Coutable a69271374d Streamline item titles to use a single class, and add back strong tags 2016-01-15 11:10:55 +01:00
Rémy Coutable d00725a175 Fix alignment issues after a fix on titles weight 2016-01-14 16:05:47 +01:00
Rémy Coutable 818607f011 Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages 2016-01-14 09:41:11 +01:00
Stan Hu 2802d4992d Expire view caches when application settings change 
Closes #5728
 2016-01-03 11:20:14 -08: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
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
Douwe Maan 2955ca613b Merge branch 'master' into reference-pipeline-and-caching 2015-12-02 11:20:51 +01:00
Robert Speicher 7dab8ed739 Rework the copy_to_clipboard logic 
It needed to be more flexible in how we set the target text or element.
 2015-11-24 19:12:03 -05:00
Douwe Maan 740feeec77 Merge branch 'master' into reference-pipeline-and-caching 2015-10-27 15:06:40 +01:00
Dmitriy Zaporozhets 9b93704614 Merge branch 'ci-status-mr-index' into 'master' 
Ci status for merge requests index page

![ci-mr-index](/uploads/1424564c87ac6ff5fb2c4bc260fbebdf/ci-mr-index.png)


See merge request !1682
 2015-10-25 09:14:48 +00:00
Dmitriy Zaporozhets 696a708401 Move rendering CI status to helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-23 17:32:52 +02:00
Robert Speicher 187625831f Add "Copy to clipboard" buttons 
Adds buttons to the commit list SHAs and the cross-project reference
data on issuables.
 2015-10-23 15:31:43 +02:00
Douwe Maan ed41333a6e Use Gitlab::Markdown.render with :pipeline option rather than different methods 2015-10-14 19:28:09 +02:00
Stan Hu dbc85bfa01 Fix bug where transferring a project would result in stale commit links 
Transferring a project to another namespace updates the project's updated_at
field, but since the cache key did not depend on the object, the page fragments
were not invalidated. This resulted in stale links to the commits. Changing
the cache key to use the object pathname solves this issue.

Closes gitlab-org/omnibus-gitlab#843
 2015-10-02 11:24:17 -07:00
Dmitriy Zaporozhets 21dfaa000d Show CI status on all pages where commits list is rendered 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:23:04 +02:00
Dmitriy Zaporozhets 496f94de4a Cache commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:41:25 +02:00
Robert Speicher 1c4bf0e474 Use skip_js for commit timestamps 
This greatly improves frontend rendering times.
 2015-06-17 16:59:51 -04:00
Douwe Maan 27af24c1c9 No longer needed to pass project argument to commit methods. 2015-04-24 12:29:36 +02:00
Douwe Maan 959ebbcade Clean up code around commit mentions. 2015-04-15 17:57:31 +02:00
Douwe Maan 6b92236eeb Don't include system notes in issue/MR comment count. 2015-03-23 16:43:08 +01:00
Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/projects/commits/_commit.html.haml
	app/views/projects/issues/_issue.html.haml
	app/views/projects/issues/_issue_context.html.haml
	app/views/projects/merge_requests/_merge_request.html.haml
	app/views/projects/merge_requests/show/_context.html.haml
 2015-02-21 12:55:28 -07:00
Dmitriy Zaporozhets 50df9a7cb9 Minor css improvements 
* lighter color for comments count
* better UI for issue assigee.milestone block
 2015-02-20 00:11:25 -08:00
Dmitriy Zaporozhets 56af5f5cf9 Improve commits page UI 2015-02-19 22:42:54 -08:00
Dmitriy Zaporozhets 906f8efd29 Refactor commits css 2015-02-19 20:45:21 -08:00
Dmitriy Zaporozhets ee6c4a2cca Improve commits UI 2015-02-19 18:23:10 -08: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
Dmitriy Zaporozhets ea04ed7879 Use 8chars short sha for commit in views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 16:30:14 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
skv fe46500448 gfm and preserve commit message 
for commits#show
 2014-08-14 15:20:34 +04:00
Dmitriy Zaporozhets 53a8d50b2b Prevent html injection on commits page by commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-10 11:09:00 +03:00
Marin Jankovski 6b121aa5a7 Move the links decision to helper. 2014-07-09 10:12:09 +02:00