home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +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
Dmitriy Zaporozhets 6caa03d422 Merge remote-tracking branch 'public/project-buttons' 2015-08-05 11:18:28 +02:00
Dmitriy Zaporozhets ab8c71de4e Fix merge request creation without branch selected 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-05 11:03:41 +02:00
Valery Sizov 6353ca9ae8 Revert "Update noteable after a new note is added" 
This reverts commit fbdaf0e2a5.
 2015-08-05 12:00:12 +03:00
Ben Bodenmiller 0f785bbc7e ink to configured gravatar host on profile page 2015-08-05 00:48:16 -07:00
Stan Hu 0c1ccda43f Add "Confirm user" button in user admin page 
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
 2015-08-05 00:35:53 -07:00
Robert Schilling 96bb42e5a7 Merge branch 'semaphore-shield' into 'master' 
Update the Semaphore badge to the shield badge type

**Why is this needed?**
It just does look better in the Readme :-)

See merge request !1092
 2015-08-05 07:04:00 +00:00
Jeroen van Baarsen 9076b5026b Update the Semaphore badge to the shield badge type 
**Why is this needed?**
It just does look better in the Readme :-)

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-08-05 08:07:35 +02:00
Achilleas Pipinellis c90e592e91 Replace relative url with full path, remove old reference for indexes 
Closes #2176 (gitlab.com)
 2015-08-05 08:38:40 +03:00
Sven Strickroth ee0fc2c3ad Put author name at the end of a tree row 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-08-05 00:12:13 +02:00
Achilleas Pipinellis 4c9ba632e9 Merge branch 'master' into 'master' 
updated restore docs wrt backup location [ci skip]

Made sure to point out that the restore location can be overwritten by
an entry in the config.

See merge request !1030
 2015-08-04 21:56:27 +00:00
karen Carias b83b333217 added note about changing servers 2015-08-04 14:51:08 -07:00
Robert Speicher f9d71c4b91 Update docs for Ruby MRI 2.1 requirement 2015-08-04 17:07:12 -04:00
Robert Speicher e9bbea7048 Don't hide the clone holder for an empty project 2015-08-04 16:58:14 -04:00
Dmitriy Zaporozhets 44ac823e59 Improve tests to use real branches in merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 17:20:26 +02:00
Kamil Trzcinski 427b5df260 Added support for CI skipped status 2015-08-04 16:47:19 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Dmitriy Zaporozhets c17f5d06aa Fix merge api and spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:33:53 +02:00
Stan Hu 88a3cfe107 Merge branch 'rs-fix-rouge-inline-theme' into 'master' 
Fix the `inline_theme` option for the Rouge formatter



See merge request !1083
 2015-08-04 14:08:49 +00:00
Dmitriy Zaporozhets 326b827ce3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-04 15:23:11 +02:00
Zeger-Jan van de Weg 4ccd767abf Only publish ssh key-type and key 2015-08-04 14:33:18 +02:00
Douwe Maan 58c76605b3 Merge branch 'update-mr-branch-text' into 'master' 
Update merge request text to reflect editability of source/target branch

Screenshot 1 (source branch deleted):

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/81dfbc4c790a1bb047d60cd4699bb71f/image.png)

Screenshot 2 (target branch deleted):

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

Closes #2134

See merge request !1085
 2015-08-04 09:01:54 +00:00
Job van der Voort e9ba1185f2 Merge branch 'add-user' into 'master' 
Added new doc about adding users and members

Added new doc in workflow about how to add users and members and I also linked it to "permissions".

See merge request !1916
 2015-08-04 08:46:47 +00:00
karen Carias c5a6c16dba typo 2015-08-03 15:55:02 -07:00
karen Carias 28cc6d9b98 text fixed 2015-08-03 15:51:09 -07:00
karen Carias 88ae5a9b20 fixed terminology 2015-08-03 15:36:26 -07:00
Stan Hu 8221236df1 Update merge request text to reflect editability of source/target branch 
Closes #2134
 2015-08-03 07:11:04 -07:00
Sytse Sijbrandij 8ec7025a5d Link to admin raketask 2015-08-03 11:33:48 +00:00
Dmitriy Zaporozhets cc4405db7d Merge branch 'add-license' 2015-08-03 11:05:19 +02:00
Dmitriy Zaporozhets c1c89500f3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-03 11:04:20 +02:00
Dmitriy Zaporozhets b118f648cb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-03 11:04:04 +02:00
Kamil Trzciński 0e994615a0 Merge branch 'redis-store' into 'master' 
Bump redis-store to 1.1.6 and remove redis-store-fix-expiry

According to this https://github.com/redis-store/redis-store/compare/v1.1.4...v1.1.6 and my manual tests the monkey patch for redis-store is no longer required

/cc @jacobvosmaer @rspeicher 


See merge request !1081
 2015-08-03 08:58:36 +00:00
Stan Hu b8433cb886 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-02 12:53:08 -07:00
Stan Hu ef707ebfac Merge pull request #9520 from gipcompany/annotate-models-update 
Re-annotate models
 2015-08-02 10:39:19 -07:00
karen Carias 4f9d32eab0 typo 2015-08-02 09:54:42 -07:00
Atsushi Ishida f33898ecfb Re-annotate models 2015-08-03 01:52:54 +09:00
karen Carias 8e53bae700 New doc about how to add an image in GitLab Basics 2015-08-02 09:52:30 -07:00
Stan Hu ecbe119af1 Fix "Network" and "Graphs" pages for branches with encoded slashes 
Closes #1359
 2015-08-02 00:07:23 -07:00
Stan Hu 208e07fe6f Fix errors deleting and creating branches with encoded slashes 
Closes #1804
 2015-08-01 23:33:33 -07:00
Robert Speicher fa5efea7f3 Fix the inline_theme option for the Rouge formatter 2015-08-01 19:10:14 -04:00
Douwe Maan 688ee3e4cb Merge branch 'rs-code-links' into 'master' 
Make `code` elements in links display as such

When a link consisted only of an inline code block -- ```[`like this`](https://google.com/)``` -- it was hard to tell that it was even a link.

Before:

> ![Screen_Shot_2015-07-31_at_5.45.06_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/eda0a0630024d461c8de151d06e9f4db/Screen_Shot_2015-07-31_at_5.45.06_PM.png)

After:

> ![Screen_Shot_2015-07-31_at_5.43.15_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9542c49cfb4d43c015d464ef0ba0440f/Screen_Shot_2015-07-31_at_5.43.15_PM.png)


See merge request !1082
 2015-08-01 12:06:26 +00:00
Robert Speicher 1aa1f39248 Make code elements in links display as such 
Also adds some minor padding to inline `code` elements.
 2015-07-31 17:44:16 -04:00
Robert Speicher 3f84c8a680 Merge branch 'api-useremails' into 'master' 
Add ability to manage user email addresses via the API.

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181

See merge request !1066
 2015-07-31 20:40:51 +00:00
Douwe MaanandRobert Speicher 8802846565 Fix indentation 2015-07-31 16:39:51 -04:00
Job van der Voort d2fffff0ec Merge branch 'add-mr' into 'master' 
New doc about creating a Merge Request in GitLab Basics

Added new doc about creating a new branch.

See merge request !1917
 2015-07-31 15:50:41 +00:00
karen Carias e72e721f04 small changes 2015-07-31 08:21:53 -07:00
Kamil Trzcinski 87df06171e Bump redis-store to 1.1.6 and remove redid-store-fix-expiry 2015-07-31 15:53:58 +02:00
Douwe Maan bdb4288ab8 Merge branch 'mention-name-in-flash-msg' into 'master' 
Mention group and project names in flash messages upon create, update and delete.

Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency.

**Before**

![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png)

**After**

![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png)

See merge request !1070
 2015-07-31 13:29:38 +00:00
Douwe Maan 3307008499 Merge branch 'admin-group-member' into 'master' 
Add specific ability for managing group members

To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)

See merge request !1059
 2015-07-31 13:25:53 +00:00
Douwe Maan 7a048cf4bf Merge branch 'fix-multiline-comment-highlighting' into 'master' 
Fix multi-line syntax highlighting

### What does this MR do?

This MR fixes multi-line syntax highlighting in the code views. HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

### Why was this MR needed?

The current styling was broken for a while.

### Screenshots

Before:

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

After:

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

### What are the relevant issue numbers?

Closes #1577
Closes #1495

See merge request !1079
 2015-07-31 12:45:42 +00:00
Douwe Maan 51e5f379dd Merge branch 'master' into api-useremails 2015-07-31 14:34:53 +02:00