home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
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
Robert Speicher e9bbea7048 Don't hide the clone holder for an empty project 2015-08-04 16:58:14 -04: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
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
Stan Hu 8221236df1 Update merge request text to reflect editability of source/target branch 
Closes #2134
 2015-08-03 07:11:04 -07:00
Dmitriy Zaporozhets cc4405db7d Merge branch 'add-license' 2015-08-03 11:05:19 +02:00
Stan Hu b8433cb886 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-02 12:53:08 -07:00
Atsushi Ishida f33898ecfb Re-annotate models 2015-08-03 01:52:54 +09: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 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
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 04f2da3c37 Merge branch 'master' into comment-updated-by 2015-07-31 14:29:23 +02:00
Douwe Maan d9e26ca6d2 Reset correct event cache 2015-07-31 14:29:18 +02:00
Douwe Maan f71d67dda1 Merge branch 'master' into add-license 2015-07-31 14:20:28 +02:00
Douwe Maan 0736f348a6 Use before_actions 2015-07-31 14:15:49 +02:00
Douwe Maan be25f261ba Merge branch 'master' into project-buttons 2015-07-31 14:12:08 +02:00
Douwe Maan 7ba7652019 Tweak project page buttons. 2015-07-31 13:56:15 +02:00
Robert Speicher a876db48d9 Merge branch 'api-new-attributes' into 'master' 
Add project star and fork count, group avatar URL and user/group web URL attributes to API

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

See merge request !1058
 2015-07-30 21:38:48 +00:00
Douwe Maan 66cc712fa5 Fix method name. 2015-07-30 15:31:34 +02:00
Douwe Maan fa9004c78c Send notification to all participants when MR is merged. 2015-07-30 15:29:43 +02:00
Douwe Maan 0b5acdd88f Show buttons to add license, changelog and contribution guide if they're missing. 2015-07-30 15:12:57 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Achilleas Pipinellis feb2865fba Raise alert when group is deleted. 
This change was made to match the project deletion.
 2015-07-30 14:11:26 +03:00
Douwe Maan 2a60b8006b Fix Project 2015-07-30 12:35:09 +02:00
Douwe Maan b8066e2cd0 No more web url 2015-07-30 11:56:15 +02:00
Douwe Maan 1e4b326463 Merge branch 'fix-single-quote-in-network-graph' into 'master' 
Fix network graph when branch name has single quotes

## Steps to reproduce

1. Create a branch with a single quote in the branch name: "`test`"
2. Look at Project's Network view

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

See merge request !1063
 2015-07-30 09:39:28 +00:00
Job van der Voort ae36842d45 Merge branch 'ssh-key-form' into 'master' 
Switched the order of the SSH key form

Now it looks like this:

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


See merge request !1069
 2015-07-30 09:26:56 +00:00
Stan Hu 369275d630 Fix network graph when branch name has single quotes 
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
 2015-07-29 23:29:47 -07:00
Achilleas Pipinellis 0fac66f84d Mention group and project name in flash messages upon create, update and delete. 2015-07-30 01:22:16 +03:00
Darby 34c2867ca2 Switched the otder of the SSH key form 2015-07-29 12:59:50 -07:00
Stan Hu 3e9b612306 Check that project was actually created rather than just validated in import:repos task 
Add gitlab-shell to error message to give user a clue that something may be wrong there.

Ran into this in #2082. User was told that repositories were created when they were
not due to hooks symlink being wrong.
 2015-07-29 10:49:13 -07:00
Douwe Maan 72c552c2d4 Fix specs 2015-07-29 13:23:28 +02:00
Douwe Maan 76b3e44c39 Merge branch 'master' into api-new-attributes 2015-07-29 12:39:44 +02:00
Douwe Maan d953f6927c Restore Leave button on dashboard groups page 2015-07-29 12:15:21 +02:00
Douwe Maan 05cca9342b Use URL helpers 2015-07-29 12:03:53 +02:00
Daryl Chan e72a9685f3 Added tags to disable autocapitalize and autocorrect on login field 
- Updated CHANGELOG
 2015-07-29 15:42:52 +08:00
Stan Hu e6feb98773 Merge pull request #9341 from rumpelsepp/rouge 
Switch back to rouge gem for synthax highlighting
 2015-07-28 23:57:03 -07:00
Stefan TatschnerandStefan Tatschner 00ff84d3c0 Add HTMLGitlab formatter 
This custom formatter for rouge is needed to generate HTML output
specifically for gitlab. Since its usecase is mostly suitable for
gitlab it had been rejected upstream:
https://github.com/jneen/rouge/pull/268

Thanks a lot to @stanhu, @jneen and @tsigo for review!
 2015-07-29 08:32:00 +02:00
Stefan TatschnerandStefan Tatschner f736721c5b Replace Rugments with Rouge 
I have mainly created the rugments fork for the purpose of improving
gitlab's highlighting. Nowadays IMO it works way better than the old
highlight.js solution. But the development is stuck on my side because
of a couple of personal reasons:

  * I have finished my studies; last months I was writing my master
    thesis. So there was a huge time problem. I am sorry for that.

  * I had to move to Munich due to getting a (paid) job. Searching a
    flat here is horrible... :)

  * Last but not least, maintaining the same code base in two seperate
    projects is a mess.

I have decided to switch back to rouge due to several reasons:

  * In the beginning I was quite motivated, but since I start
    working on my new job next week, the best solution IMO is
    switching back to upstream rouge.

  * Rouge is continously improving:
    https://github.com/jneen/rouge/blob/master/CHANGELOG.md
    http://rouge.jneen.net/

  * There should be absolutely no regressions with this change. Most
    likely this pull request will almost fix some minor bugs.

  * One less gem in gitlab is a good thing. since Gitlab is quite a
    huge bundle of gems. Reducing complexity should be a major
    milestone.

Thanks a lot to @stanhu and @jneen for the review!
 2015-07-29 07:40:58 +02:00
Robert Speicher 40c32b26af Merge branch 'rs-issue-2107' into 'master' 
Make `hr`s more visible in note bodies

Closes #2107

See merge request !1054
 2015-07-28 22:12:35 +00:00
Robert Speicher 0f77d4095e Merge branch 'bitbucket-re-authorize' into 'master' 
Fix bug causing Bitbucket importer to crash when OAuth application
had been removed.

Fixes gitlab-com/support-forum#241.

See merge request !1057
 2015-07-28 21:57:44 +00:00
Douwe Maan b230335090 Show Leave button when you're the last owner, so that the error explains the reason 2015-07-28 17:52:38 +02:00
Douwe Maan 45acfdd32a Disable adding members from admin area when appropriate 2015-07-28 16:36:48 +02:00
Douwe Maan f9bcb9632c Add specific ability for managing group members 2015-07-28 16:32:15 +02:00
Douwe Maan a784b996b3 Add project star and fork count, group avatar URL and user/group web URL attributes to API 2015-07-28 15:49:44 +02:00
Job van der Voort f21ac8f5c6 Merge branch 'timestamp-wikis' into 'master' 
Added a timestamp to the wikis page just below the title

Now it looks like this:

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



See merge request !1055
 2015-07-28 13:47:25 +00:00
Douwe Maan 42ebd902de Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-07-28 15:33:16 +02:00