home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,898 Commits 48 Branches 340 Tags
5a7e4dfd3362d08c856fdfcf4b82584c2cac169f
Commit Graph
26898 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamil Trzcinski 5a7e4dfd33 Merge branch 'after-script' into make-before-after-overridable 
* after-script:
  Add CHANGELOG and documentation
  Rename finally_script to after_script

Conflicts:
	lib/ci/gitlab_ci_yaml_processor.rb
	spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
 2016-04-17 09:06:55 -04:00
Kamil Trzcinski a0afeefd76 Add CHANGELOG and documentation 2016-04-17 09:02:42 -04:00
Kamil Trzcinski cc57d61023 Rename finally_script to after_script 2016-04-17 08:59:57 -04:00
Kamil Trzcinski 4cc9a02ee0 Allow the before_script and finally_script to be overwritten in context of job 2016-04-16 19:22:49 +02:00
Kamil Trzcinski b340b59743 Implement finally_script which allows to do cleanups as part of the build process 2016-04-16 19:22:48 +02:00
Jacob Schatz 8c9cc6d26c Merge branch 'rs-branch-name-space' into 'master' 
Remove extra spacing from merge request target branch name



See merge request !3758
 2016-04-15 23:58:18 +00:00
Robert Speicher 2e4d9c1de6 Merge branch 'fix/project-import_url' into 'master' 
Fix for import_url fields on projects containing third-party credentials

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2658 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13955

See merge request !3066
 2016-04-15 21:52:00 +00:00
Robert Speicher 47c6111546 Remove extra spacing from merge request target branch name 2016-04-15 17:17:48 -04:00
Rémy Coutable 492019a2a3 Merge branch 'new-mr-improvements' into 'master' 
Updated MR compare

Based on in feedback in !3228

See merge request !3704
 2016-04-15 17:30:05 +00:00
Rémy Coutable 91dca9a883 Add 8.6.6 CHANGELOG entries 
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-15 19:13:31 +02:00
Robert Speicher 34b0561560 Merge branch 'pmq20/gitlab-ce-psvr/change-head' into 'master' 
Use rugged to change HEAD

_Originally opened at !2850 by @pmq20._

Needless to invoke gitlab_shell here, which is slow.

See merge request !3705
 2016-04-15 16:44:21 +00:00
Jacob Schatz bb59a1f98e Merge branch 'assign-to-issuable-opener' into 'master' 
Issuable can be assigned to author

Closes #9014

The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.

/cc @DouweM

See merge request !2765
 2016-04-15 15:43:26 +00:00
Phil Hughes 5b374226a7 Indented code 2016-04-15 16:36:07 +01:00
Rémy Coutable 8b7bf2a0e0 Merge branch 'rugged-delete-tag' into 'master' 
Delete tags via rugged

Improve the performance by directly using rugged instead of shelling out to a git operation.

See merge request !3748
 2016-04-15 14:42:05 +00:00
Robert Schilling 3c704c33e0 Delete tags via rugged 2016-04-15 16:05:04 +02:00
Zeger-Jan van de Weg 33f8b06c39 Merge branch 'master' into assign-to-issuable-opener 2016-04-15 14:38:15 +02:00
Rémy Coutable 2ac0050bce Merge branch 'remove-backend-code' into 'master' 
Remove unused backend methods

Those backend methods are not used anymore since the functionality of them is replaced with rugged.

See merge request !3746
 2016-04-15 12:14:17 +00:00
Robert Schilling 106c443e76 Remove unused backend methods 2016-04-15 13:30:33 +02:00
Rémy Coutable f8e8a61c9c Remove Gitlab::Shell#update_repository_head since it's not used anymore 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-15 11:38:59 +02:00
Jacob Vosmaer c795ef079c Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2016-04-15 10:42:32 +02:00
Rémy Coutable cd8fa2e6c0 Fix required gitlab-shell version. 
Fix required gitlab-shell version in the 8.5 to 8.6 update doc.
 2016-04-15 10:19:04 +02:00
Rémy Coutable ddec8e777f Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master' 
Make /profile/keys/new redirects to /profile/keys for back-compat

This addresses https://github.com/gitlabhq/gitlabhq/issues/10138.

See merge request !3717
 2016-04-15 08:19:01 +00:00
Rémy Coutable 4e2f068c5f Merge branch 'i_14431_award_emoji_count_not_in_comment_count' into 'master' 
Do not include award emojis in issue view comment_count

## What does this MR do?

Fixes Issue #14431, changing comment_count on issues index view to not include award emoji comments. While including them is technically correct, it feel nonintuitive in the way comments are presented.

## Are there points in the code the reviewer needs to double check?

No

## Why was this MR needed?

Improves UX of issues view

## What are the relevant issue numbers?

#14431

## Screenshots

### Before
 - ![Issues before](https://monosnap.com/file/cs7lcEkcChXXvAV22y2gh7gBFWCWjj.png)
 - ![MR before](https://monosnap.com/file/qzOawShznyXMKK3Z5cij4SKrHO4jNy.png)
### After
 - ![Issues after](https://monosnap.com/file/IWMedIiGnDnCly7zI5BwNTYQuCS8fH.png)
 - ![MR after](https://monosnap.com/file/mXJu1C2OVo5DGK0XdD67vPZGNPAw4L.png)


See merge request !3610
 2016-04-15 07:58:29 +00:00
Rémy Coutable a434ffd3b3 Make /profile/keys/new redirects to /profile/keys for back-compat 
Report: https://github.com/gitlabhq/gitlabhq/issues/10138

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-15 09:45:58 +02:00
James Lopez ca725aaf4c resolve merge conflict 2016-04-15 08:52:26 +02:00
James Lopez 05985b49a4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-15 08:49:08 +02:00
Douwe Maan 447a905088 Merge branch 'rs-trailing-slash-in-search' into 'master' 
Escape the query argument provided to `git grep` by `search_files`

Closes #14963.

See merge request !3633
 2016-04-15 06:46:47 +00:00
lurdan d2f490c8f3 fix required gitlab-shell version. 
Under the procedure, I've warned about gitlab-shell version, which should be 2.6.12 (may be some minor revisions introduces that).
 2016-04-15 12:41:26 +09:00
Robert Speicher a1497ba39c Merge branch 'fix-migrate_new_notification_setting' into 'master' 
Fix datetime format when migrating new notification settings on MySQL

Closes #15264 

See merge request !3733
 2016-04-14 22:45:52 +00:00
Douglas Barbosa Alexandre 70c9ceb7b1 Fix datetime format when migrating new notification settings on MySQL 2016-04-14 18:46:18 -03:00
Robert Speicher 0554664e56 Merge branch 'patch-1' into 'master' 
change "very demand" to "specific demand" in CI runner docs

[ci skip]

See merge request !3726
 2016-04-14 21:39:57 +00:00
Jacob Schatz ba18e0b208 Merge branch '14176-diff-paste-data' into 'master' 
Copying and pasting doesn't grab line numbers or +/-

Fixes #14176 

See merge request !3687
 2016-04-14 21:01:08 +00:00
Stan Hu 95ce4d29c3 Merge branch 'rs-sentry-contexts' into 'master' 
Add Sentry program context even without a current user



See merge request !3729
 2016-04-14 20:18:01 +00:00
Robert Speicher 1f0274e55e Merge branch 'remove-ci-nginx-config' into 'master' 
Remove deprecated NGINX CI config

[ci skip]

See merge request !3728
 2016-04-14 19:34:57 +00:00
Robert Speicher 97fd9616ac Merge branch 'emoji_category_fix' into 'master' 
Emoji categories fix

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14020

See merge request !3727
 2016-04-14 18:22:49 +00:00
theoretick 5bf47f14b9 Do not include award emojis in issue view comment_count 
Fixes Issue #14431
 2016-04-14 11:20:55 -07:00
Jacob Schatz 9cd5e0fc48 Merge branch 'subscribe-button-fix' into 'master' 
Removed references to subscribe-button CSS class

These were being blocked by adblocks

Closes #15043

See merge request !3677
 2016-04-14 18:11:18 +00:00
Robert Speicher f583129767 Add Sentry program context even without a current user 2016-04-14 13:56:30 -04:00
Valery Sizov 6ae2680ce7 Emoji categories fix 2016-04-14 20:45:55 +03:00
Annabel Dunstone 80d8f8b876 Syntax & style updates 2016-04-14 12:33:29 -05:00
Achilleas Pipinellis 2165bbc785 Remove deprecated NGINX CI config 2016-04-14 20:31:19 +03:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master' 
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
 2016-04-14 17:15:58 +00:00
Robert Speicher 58ca84908c Merge branch 'fix-group-projects-sort' into 'master' 
Projects on group page should be sorted by last activity instead of id/created_at

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

Fixes #15237 

See merge request !3716
 2016-04-14 17:15:17 +00:00
Robert Speicher cce21e7490 Update CHANGELOG for "Auto git fsck" 2016-04-14 12:32:33 -04:00
Robert Speicher 7ef35b9c61 Shut up, Rubocop 2016-04-14 12:28:48 -04:00
James Lopez e5f7a54530 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-04-14 18:12:10 +02:00
James Lopez 46d1cf43a4 update changelog [ci skip] 2016-04-14 18:05:53 +02:00
Jamie Neubert Pedersen b49069b72c change: "very demand" changed to "specific demand" 
This must be an error as the sentence doesn't make sense otherwise
 2016-04-14 16:04:18 +00:00
Rémy Coutable dd9ced0af9 Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' 
Fix revoking of authorized OAuth applications

Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized.

Added a spec and also found that the `gon` variables were not being set for this view.

Closes #14370

See merge request !3690
 2016-04-14 15:26:09 +00:00
Rémy Coutable 4a514b27e9 Merge branch 'issue_15155' into 'master' 
Setup visibility level for project when transfering for a group

fixes #15155 

See merge request !3707
 2016-04-14 15:13:08 +00:00