home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis a9f7df56ba Merge branch 'yaml-ci-cleanup' into 'master' 
Clean up ci yaml doc

* Fix headings so that they are picked up by doc.gitlab.com
* Stick to 80 characters
* Clean up some examples

See merge request !2052
 2015-12-16 19:50:21 +00:00
Rubén Dávila d7dd9c3982 Fix Rubocop complain. 2015-12-16 14:40:16 -05:00
Rubén Dávila 0861b67f45 Fix broken spec. #3452 2015-12-16 14:37:57 -05:00
Douwe Maan 2d0f9dd02e Fix merge widget JS for buttons 2015-12-16 19:53:38 +01:00
Douglas Barbosa Alexandre c91cf1f66b Remove the hint on the branch name input 2015-12-16 16:48:14 -02:00
Douwe Maan 76708c2c18 Merge branch 'master' into fix-merge-immediately-button 2015-12-16 19:43:52 +01:00
Douglas Barbosa Alexandre 9c266d4935 Add more descriptive error message when create branch with invalid name 2015-12-16 16:34:03 -02:00
Douwe Maan 8eb51dc037 Fix updating and disabling merge button when Merge Immediately is clicked 2015-12-16 19:27:46 +01:00
Dmitriy Zaporozhets 76642d7a80 Merge branch 'feature/remove-celluloid' into 'master' 
Update rerun to remove celluloid as dependency

After sidekiq 4 migration, we no longer need celluloid. `rerun` recent version also removed it from its dependency, so by getting this MR merged, we can solve #3797 

See merge request !2088
 2015-12-16 18:24:25 +00:00
Dmitriy Zaporozhets 7070942521 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 19:19:25 +01:00
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
Dmitriy Zaporozhets 6374bdb352 Merge branch 'mr-builds-fixes' into 'master' 
Link to correct (source) project on MR builds tab

Used to link to `gitlab-org/gitlab-ce/commits/<branch-name>`, now links to correct project.

See merge request !2115
 2015-12-16 18:16:03 +00:00
Douwe Maan d89216ee3a Merge branch 'disable-markdown-cache' into 'master' 
Temporarily disable Markdown caching



See merge request !2120
 2015-12-16 18:06:01 +00:00
Dmitriy Zaporozhets 3321f694b8 Merge branch 'fix-milestone-snippet-header' into 'master' 
Fix headers of milestone and snippet show pages

Fix layout, and move "Edit" button to very right just like issue/MR.

Before:

![Screen_Shot_2015-12-15_at_17.33.20](/uploads/dbbeb6868b80e21894159126a0feca6a/Screen_Shot_2015-12-15_at_17.33.20.png)

![Screen_Shot_2015-12-15_at_17.33.28](/uploads/53d10b42adc34e48b063889120e9a746/Screen_Shot_2015-12-15_at_17.33.28.png)

After:

![Screen_Shot_2015-12-15_at_17.34.25](/uploads/b0d0ea3f6a7b61d51b474419207f7a02/Screen_Shot_2015-12-15_at_17.34.25.png)

![Screen_Shot_2015-12-15_at_17.35.55](/uploads/65b922f5249655d3733740690577c9d7/Screen_Shot_2015-12-15_at_17.35.55.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2104
 2015-12-16 17:59:28 +00:00
Robert Speicher e27db8694c Merge branch 'reference-cache' into 'master' 
Only cache markdown when object has been saved and has a proper cache_key.

See merge request !2119
 2015-12-16 17:58:14 +00:00
Robert Speicher b5230bbe7c Merge branch 'fix-merge-immediately' into 'master' 
Fix 'Merge Immediately' button

Fixes #4125

See merge request !2117
 2015-12-16 17:51:25 +00:00
Douwe Maan d337d5e713 Temporarily disable Markdown caching 2015-12-16 18:50:06 +01:00
Douwe Maan 6ea26ae623 Only cache markdown when object has been saved and has a proper cache_key. 2015-12-16 18:36:14 +01:00
Cauan Cabral d2b5ef1c1e Remove CI_BUILD_BEFORE_SHA from CI documentation 
As pointed in #3210, the environment variable isn't usable any more.
 2015-12-16 14:23:02 -03:00
Achilleas Pipinellis fc9fbdce44 Clean up ci yaml doc [ci skip] 
* Fix headings so that they are picked up by doc.gitlab.com
* Stick to 80 characters
* Clean up some examples
 2015-12-16 19:13:04 +02:00
Rubén Dávila 3f83a1585f Add link to MR from Build detail page. #3452 2015-12-16 11:54:48 -05:00
Douwe Maan 4dfd4e0366 Merge branch 'fix-bad-merge' into 'master' 
Fix bad merge

/cc: @dzaporozhets 

See merge request !2116
 2015-12-16 16:48:30 +00:00
Douwe Maan 9908da17c1 Merge branch 'fix-endpoint-not-setting-var' into 'master' 
Fix endpoint not setting needed @ci_commit

/cc @DouweM

See merge request !2112
 2015-12-16 16:39:35 +00:00
Douwe Maan 5843d09f07 Fix 'Merge Immediately' button 2015-12-16 17:38:58 +01:00
Dmitriy Zaporozhets 747f0a328c Merge branch 'control-list-right-margin' into 'master' 
Fix right margin of control list

Before:

![Screen_Shot_2015-12-16_at_16.29.39](/uploads/7a6aa79b6af0900d9257ce86ab822a22/Screen_Shot_2015-12-16_at_16.29.39.png)

After:

![Screen_Shot_2015-12-16_at_16.29.45](/uploads/d52fdc70ecd63fc61ae6ae87b3b7d1a5/Screen_Shot_2015-12-16_at_16.29.45.png)


See merge request !2114
 2015-12-16 16:07:06 +00:00
Douwe Maan 18e1929ff8 Fix spec 2015-12-16 17:07:02 +01:00
Stan Hu 02f5673171 Fix bad merge 2015-12-16 08:02:28 -08:00
Dmitriy Zaporozhets 28832fef7c Merge branch 'issuable-sidebar' into 'master' 
Issuable sidebar tweaks

- Move cross-project reference down 
- ~~Fix "Notifications" label color~~ Reverted
- ~~Use regularly colored button for "Subscribe"/"Unsubscribe"~~ Reverted

Before:

![Screen_Shot_2015-12-15_at_17.38.08](/uploads/d4eeab44bb21fca2fe9ebe620ed9e060/Screen_Shot_2015-12-15_at_17.38.08.png)

After:

(Only the moved cross-project reference is still relevant, other changes have been reverted)

![Screen_Shot_2015-12-15_at_17.38.23](/uploads/b61aed3a0884c986785a5b09af8dbb25/Screen_Shot_2015-12-15_at_17.38.23.png)

cc @skyruler 

cc @rspeicher 8.3 please!

See merge request !2105
 2015-12-16 15:54:10 +00:00
Douwe Maan 5fc90eec50 Link to correct (source) project on MR builds tab 2015-12-16 16:47:39 +01:00
Dmitriy Zaporozhets fa4545e3f9 Merge branch 'fix-border' into 'master' 
Fix double right border in MR discussion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

# Before
![Screenshot_2015-12-16_15.44.00](/uploads/dd2c85e82fdb784e897cf1a695af1a1e/Screenshot_2015-12-16_15.44.00.png)

# After
![Screenshot_2015-12-16_15.43.36](/uploads/b50954e01bb3f45d2df6f43d34a1db60/Screenshot_2015-12-16_15.43.36.png)

cc @skyruler 

See merge request !2113
 2015-12-16 15:46:18 +00:00
Douwe Maan d8978acd39 Fix right margin of control list 2015-12-16 16:30:01 +01:00
Douwe Maan ff16ee63e6 Revert "Fix "Notifications" label color" 
This reverts commit e4e1777aa5.
 2015-12-16 16:23:31 +01:00
Douwe Maan f4c94e1fd6 Revert "Use regularly colored button for "Subscribe"/"Unsubscribe"" 
This reverts commit c1db8d1590.
 2015-12-16 16:23:18 +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 c21cd0ba1f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 16:09:09 +01:00
Dmitriy Zaporozhets b8570576e8 Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitlab-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-16 16:08:35 +01:00
Douwe Maan 41d6b3701e Merge branch 'master' into fix-milestone-snippet-header 2015-12-16 15:56:23 +01:00
Dmitriy Zaporozhets 9472d1372f Fix double border in MR discussion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-16 15:41:50 +01:00
Zeger-Jan van de Weg 95c03f245f Fix endpoint not setting needed @ci_commit 2015-12-16 15:20:53 +01:00
Mike Wyatt b45ee2c314 better support for referencing and closing issues in asana_service.rb 2015-12-16 10:08:05 -04:00
Douwe Maan d60047bb31 Merge branch 'remove-author-from-email' into 'master' 
Revert "Make sure notify email always has author info."

This reverts commit 303f79f804.

See merge request !2103
 2015-12-16 13:51:45 +00:00
Kamil Trzciński 089696b462 Merge branch 'workhorse-passthrough' into 'master' 
Pass all requests from NGINX to gitlab-workhorse



See merge request !2073
 2015-12-16 13:40:20 +00:00
Dmitriy Zaporozhets a1fd87cddb Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:37:04 +01:00
Douwe Maan 4df8477afc Fix tests 2015-12-16 14:35:01 +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 e65dfcf2b0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 14:29:13 +01:00
Achilleas Pipinellis 78be4fb21c Merge branch 'add_svn_2_git_docs' into 'master' 
Add SVN to Git migration documentation

Document the process of migrating a SVN repository and pushing it to GitLab.

cc/ @axil

See merge request !2028
 2015-12-16 13:24:36 +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 259a7d7ba5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-16 13:45:14 +01:00