home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +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
Douwe Maan 7df45882a9 Update specs. 2015-05-25 18:37:38 +02:00
Douwe Maan 0c8d8b91e0 Clarify navigation labels for Project Settings and Group Settings. 2015-05-25 17:18:24 +02:00
Douwe Maan d25026a512 Add Accepted and Rejected tabs to MR lists. 2015-05-25 17:01:27 +02:00
Douwe Maan ebe9c89082 Consistently refer to MRs as either Accepted or Rejected. 2015-05-25 17:01:14 +02:00
Douwe Maan 59f0d91a20 Prefix EmailsOnPush email subject with [Git]. 2015-05-25 16:35:37 +02:00
Douwe Maan a9e2686139 Update specs. 2015-05-25 16:31:20 +02:00
Douwe Maan 2fa5c7513e Group project contributions by both name and email. 2015-05-25 15:43:22 +02:00
Douwe Maan 04d4452286 Merge branch 'disabled-issues-mr-features' into 'master' 
Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings

Closes #1676

See merge request !691
 2015-05-25 12:04:55 +00:00
Stan Hu a7d8a7bd3d Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings 
Closes #1676
 2015-05-25 06:16:33 -04:00
Robert Schilling 608bd4bb4c Let's start 7.12 2015-05-25 10:15:36 +00:00
Robert Schilling 84cb0dcbcd Merge branch 'fix-redundant-changelog-entry' into 'master' 
Remove redundant CHANGELOG entry

This was moved into v7.10.4, but I forgot to delete it from the v7.11 list.

See merge request !692
 2015-05-25 08:17:57 +00:00
Douwe Maan 2d0a9c4cc2 Merge branch 'add-webhook-note-events' into 'master' 
Add support for Webhook note events

This MR adds support for note events (comments) for WebHooks.

Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think?

Screenshot after:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/299b141d82f7b14943a74258d5c57ca6/image.png)

Closes https://github.com/gitlabhq/gitlabhq/issues/6745

See merge request !673
 2015-05-25 07:57:52 +00:00
Stan Hu 310e08dc2c Fix clone URL losing selection after a single click in Safari and Chrome 
Closes #9326
 2015-05-24 20:19:26 -04:00
Robert Speicher 7b879bb8bd Bump secret key length to 32 2015-05-23 18:47:53 -04:00
Robert Speicher e73ea12695 Add support for manually entering 2FA details 2015-05-23 15:04:40 -04:00
Martins Polakovs cfc9bff45e Fix upgrader script 2015-05-23 13:11:23 +03:00
Sytse Sijbrandij 1d25f665e8 Merge branch 'keyboard_shortcuts' into 'master' 
Keyboard shortcuts

Added doc about how to view keyboard shortcuts

cc/ @sytse

See merge request !1829
 2015-05-22 23:38:19 +00:00
Karen Carias 0c14044203 fixed link 2015-05-22 23:12:12 +00:00
Karen Carias 43a11f4b53 Added link to keyboard shortcuts 2015-05-22 23:11:36 +00:00
Patricio Cano f042b085f6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-22 18:10:35 -05:00
Karen Carias dffc313bb5 test1 image 2015-05-22 23:08:50 +00:00
Karen Carias 920b547d63 keyboard shortcuts in GitLab 2015-05-22 23:08:12 +00:00
Patricio Cano c17a15db08 Added 7.11.2 to CHANGELOG 2015-05-22 18:03:31 -05:00
karen Carias fdc9ae7ca2 picture for shortcuts 2015-05-22 15:57:29 -07:00
Stan Hu 3b22cfe600 Remove Rack Attack monkey patches and bump to version 4.3.0 2015-05-22 16:25:03 -04:00
Sytse Sijbrandij b1e860a63a EE can be accessed without a subscription 2015-05-22 19:03:23 +00:00
Douwe Maan c4e48d27a7 Merge branch 'fix-merge-request-assignee-list' into 'master' 
Use the user list from the target project in a merge request

### What does this MR do?

This MR derives the assignable users from the target project.

### Why was this MR needed?

In a merge request, the assignable users uses the list from the forked project, not the target project where the merge request will be going. For example, if I fork a project from the gitlab-org namespace into my personal namespace, make some changes, and then create a merge request, the only users I see are me. I think it makes more sense to show all the users in gitlab-org. This is a regression caused by 1c2711f.

### What are the relevant issue numbers?

Closes #1535

See merge request !682
 2015-05-22 15:58:18 +00:00
Job van der Voort c24906016f update CHANGELOG with release 7.11.1 2015-05-22 14:43:37 +00:00
Stan Hu ddc66af804 This entry was already present in v7.10.4 2015-05-22 10:34:40 -04:00
Stan Hu 7a7ce70169 Use the user list from the target project in a merge request 
Closes #1535
 2015-05-22 09:52:09 -04:00
Job van der Voort 33dbb30fb4 notify the core team and devs 2015-05-22 15:19:06 +02:00
Dmitriy Zaporozhets f5db97aad6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-22 14:22:52 +03:00
Job van der Voort 906f958f89 Merge branch 'timezones' into 'master' 
Changing your time zone

Added doc and link in workflow to how to change your time zone in Gitlab.

I used the following documents as reference. Please double check that the instructions I wrote are correct.
http://www.borngeek.com/2015/02/27/setting-the-time-zone-in-gitlab/
https://gitlab.com/gitlab-org/gitlab-ce/issues/443

I found that several users have this same issue, that they don't know how to change their time zone:
https://github.com/gitlabhq/gitlabhq/issues/5555
https://gitlab.com/gitlab-org/omnibus-gitlab/issues/347
https://gitlab.com/gitlab-org/gitlab-ce/issues/56
http://jonathonreinhart.blogspot.com/2014/10/gitlab-time-zone-issues.html
http://stackoverflow.com/questions/5073917/why-doesnt-config-time-zone-seem-to-do-anything

See merge request !1827
 2015-05-22 07:30:43 +00:00
Stan Hu deeff56967 Add support for Webhook note events 
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
 2015-05-21 23:48:16 -04:00
Robert Speicher 4e2ee018c3 Make the actual labels on Labels#index links 
Now the user can click the labels themselves or the "X open issues"
text.
 2015-05-21 23:43:08 -04:00
Robert Speicher 9bdd7f34a5 Add link_to_label helper 2015-05-21 23:40:25 -04:00
Karen Carias 9622348bed Added note about backups for gitlab.com 2015-05-21 21:39:00 +00:00
Karen Carias 1132b3e8dc Link to change your time zone in Gitlab CE 2015-05-21 20:05:39 +00:00
Karen Carias 871c90c3d1 Added instructions to change time zone in GitLab CE 2015-05-21 20:03:25 +00:00
Douwe Maan 2b1b026a1e Merge branch 'fix-atom-feeds' into 'master' 
Fix Atom feeds.

Fixes #1643 and #1644.

See merge request !688
 2015-05-21 09:49:34 +00:00
Douwe Maan 9a60441ce4 Fix Atom feeds. 2015-05-21 11:39:33 +02:00
Douwe Maan 7298d05cc0 Merge branch 'rs-issue-1568' into 'master' 
Work around a Chrome 43 bug preventing note editing

Fixes #1568 - and I mean "fixes"

I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11.

See merge request !684
 2015-05-21 09:31:59 +00:00
Douwe Maan cbcc5f8544 Workaround that doesn't add unwanted newline. 2015-05-21 11:22:21 +02:00
Job van der Voort 3a3f4b41e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-21 10:38:22 +02:00
Job van der Voort 90b1019ab4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-21 10:37:58 +02:00
Hannes Rosenögger 10620c5986 Merge branch 'fix-v7.10.4-changelog' into 'master' 
Update CHANGELOG with v7.10.4 changes

See merge request !662
 2015-05-21 08:12:28 +00:00
Douwe Maan 206455a74b Merge pull request #9316 from jvanbaarsen/gitlab-git-update 
Updated the gitlab_git gem
 2015-05-21 09:55:31 +02:00
Jeroen van Baarsen 2b725777fe Merge pull request #9317 from jvanbaarsen/move-changelog-stuff 
Moved changelog stuff to the correct release
 2015-05-21 09:48:11 +02:00
Jeroen van Baarsen 7d658f2dbd Moved changelog stuff to the correct release 
**Why was this needed?**
The changes are pulled in 7.12.0 but where mistakenly put under 7.11.0

[skip-ci]
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-21 09:46:42 +02:00
Jeroen van Baarsen caf4a6cfd7 Merge pull request #9278 from jvanbaarsen/pr/8755 
Disabled expansion of top/bottom blobs for new file diffs
 2015-05-21 09:45:30 +02:00