home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,734 Commits 48 Branches 340 Tags
db7bbadf95d9f2266a055ee50a67fa895b0f21a9
Commit Graph
1349 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 664384e78b Merge remote-tracking branch 'origin/rs-simplify-status-icon' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-16 19:19:07 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Dmitriy Zaporozhets a1fd87cddb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:37:04 +01:00
Douwe Maan e07c9c1ee1 Merge branch 'rs-clipboard-fixes' into 'master' 
Fix clipboard buttons on MR instructions and Commit#show



See merge request !2108
 2015-12-16 13:30:15 +00:00
Dmitriy Zaporozhets a9d19fa8ef Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:24:32 +01:00
Douwe Maan 8e9f740d08 Merge branch 'rs-timeago' into 'master' 
Fix time_ago_with_tooltip for activity feed

Closes #4002

See merge request !2074
 2015-12-16 13:07:06 +00:00
Dmitriy Zaporozhets 40104746d6 Merge remote-tracking branch 'origin/feature/update-rubocop' 2015-12-16 13:44:50 +01:00
Robert Speicher f49ac5c8d3 Fix clipboard buttons on MR instructions and Commit#show 2015-12-15 16:11:01 -05:00
Douwe Maan 48b3ad6d37 Banzai::XFilter -> Banzai::Filter::XFilter 2015-12-15 16:10:32 +01:00
Douwe Maan 7781bda9bd Move Markdown/reference logic from Gitlab::Markdown to Banzai 2015-12-15 15:51:16 +01:00
Gabriel Mazetto b5291f9599 Fixed Rubocop offenses 2015-12-15 00:53:52 -02:00
Grzegorz Bizon 32d83ee79f Merge branch 'master' into ux/suppress-ci-yml-warning 
* master: (24 commits)
  Fix runners admin view
  Fix migrations
  Run builds from projects with enabled CI
  Use Gitlab::Git instead of Ci::Git
  Fix last specs
  Fix specs
  Fix after column rename
  Fix errors
  Update badge
  Finishing touches
  Fix triggers tests
  Rename columns and rename migrations
  Reimplement Trigger API
  Remove ci_ prefix from all ci related things
  Add runners token
  Migrate CI::Project to Project
  Fix indentation and BuildsEmailService
  Change default values
  Enhance migrate CI emails
  Fix issue tracker service
  ...

Conflicts:
	spec/features/commits_spec.rb
 2015-12-14 12:25:37 +01:00
Kamil Trzciński c810234357 Merge branch 'ci-project-migrate' into 'master' 
Ci Project migrate

- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.

In 8.4 or 8.5 we can remove redundant tables and columns.


See merge request !1987
 2015-12-14 10:35:40 +00:00
Grzegorz Bizon 2dafec91dd Add matcher class to ci status link 2015-12-14 11:03:33 +01:00
Robert Speicher 3084c8c370 Define CI status icon colors in SCSS instead of a helper 2015-12-12 13:18:51 -05:00
Robert Speicher 456ddb5eb7 Fix time_ago_with_tooltip for activity feed 
Closes #4002
 2015-12-11 13:57:49 -05:00
Kamil Trzcinski 2b7a75ceaf Update badge 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 1e2a4895c8 Finishing touches 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 3d9ce37a48 Reimplement Trigger API 2015-12-11 18:02:09 +01:00
Kamil Trzcinski 64bfd9d71a Remove ci_ prefix from all ci related things 2015-12-11 18:02:09 +01:00
Kamil Trzcinski e80e3f5372 Migrate CI::Project to Project 2015-12-11 18:02:09 +01:00
Greg Smethells 0272f27401 display referenced merge requests in issue description with CI status 2015-12-11 10:14:55 -06:00
Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching 
# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb
 2015-12-10 14:04:34 +01:00
Dmitriy Zaporozhets 7a4d468576 Merge remote-tracking branch 'origin/mr-broken' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 21:06:04 +01:00
Eirik Lygre bb79573c01 Merge branch 'master' into default_clone_protocol_based_on_user_keys 2015-12-09 15:07:10 +01:00
Zeger-Jan van de WegandStan Hu 56f25c3e61 Improve text indication visibility on snippets 2015-12-08 14:31:24 -08:00
Robert Speicher e6668f8e34 Merge branch 'edit-in-patch-branch' into 'master' 
Default target branch to patch-n when editing file in protected branch

Fixes #3441

See merge request !2021
 2015-12-08 22:04:52 +00:00
Douwe Maan fae08104b4 Merge branch 'master' into mr-broken 
# Conflicts:
#	app/helpers/ci_status_helper.rb
 2015-12-08 22:38:29 +01:00
Douwe Maan 065375ca2d Use "Build passed" in tooltip instead of "Build status: passed" 2015-12-08 21:43:52 +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
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 18:50:02 +01:00
Douwe Maan 7aeb7077cb Only show Edit button for text blobs. 2015-12-08 17:11:23 +01:00
Douwe Maan 82ddd738b6 Show tooltip when trying to edit file when not on branch 2015-12-08 17:10:07 +01:00
Douwe Maan df6750d3d6 Default target branch to patch-n when editing file in protected branch 2015-12-08 16:42:10 +01:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Douwe Maan 51ed5225ad Merge branch 'serve_lfs_object' into 'master' 
Serve LFS object

Depends on gitlab-org/gitlab_git!57

See merge request !1976
 2015-12-08 14:19:52 +00:00
Douwe Maan 926c3bef9f Merge branch 'master' into reference-pipeline-and-caching 2015-12-08 13:40:32 +01:00
Douwe Maan 3c80a54315 Merge branch 'master' into ui/misc 2015-12-08 12:50:25 +01:00
Robert Speicher 9d03bc6fa3 Merge branch 'pberndt:master' into 'master' 
Fix #3758: Serious performance issues due to timeago()
being called n*(n+1)/2 times instead of n

See bug #3758 for a description. This merge request alters 
`time_ago_with_tooltip` to invoke the `timeago()` javascript on the
current timestamp only, instead of each one defined on the page so far.

See merge request !1977
 2015-12-07 20:01:39 +00:00
Eirik Lygre 419d6fa6b1 Simplify expression per feedback from @rspeicher 2015-12-07 19:24:51 +01:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan cbcb8dbe70 Use select2 dropdown for dashboard/group 'New X' buttons 2015-12-07 17:12:04 +01:00
Marin Jankovski bf17609e2a Rename blob helper, bump version of gitlab_git to 7.2.21. 2015-12-07 15:56:38 +01:00
Marin Jankovski e53b350cb6 Add specs for showing lfs object in UI. 2015-12-07 15:03:50 +01:00
Douwe Maan d611a38798 Merge branch 'master' into reference-pipeline-and-caching 2015-12-07 14:48:53 +01:00
Douwe Maan dddfbb653e Merge branch 'master' into ui/misc 2015-12-07 13:48:18 +01:00
Douwe Maan 0bca65b283 Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-date 2015-12-07 12:03:34 +01:00
Eirik Lygre 88217029fc When rendering the clone page, check user profile to decide default clone protocol. If the user has uploaded SSH-keys, use SSH; otherwise, use http(s). Close #3504. 2015-12-06 20:48:04 +01:00
Robert Speicher d2f9a9012d Merge branch 'link-refs' into 'master' 
Recognize issue/MR/snippet/commit links as references.

Fixes #3744 and #3745

See merge request !1933
 2015-12-04 20:58:45 +00:00
Rubén Dávila aa1ba00936 Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 2015-12-04 10:43:33 -05:00