home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f16de8ac8c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-11 11:29:18 +02:00
Dmitriy Zaporozhets 767f7d9ae7 Merge branch 'ldap-code' into 'master' 
LDAP code from EE
 2014-03-11 09:28:41 +00:00
Dmitriy Zaporozhets c6d39a14d6 Add User#requires_ldap_check? method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 10:24:07 +02:00
Dmitriy Zaporozhets 4b9466903f Merge pull request #6503 from mjdetullio/fix/group-admin 
[6.6] Fixes a bug with group member administration
 2014-03-11 10:12:21 +02:00
Dmitriy Zaporozhets e57e1e04e3 Remove non-exist method from ldap security check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 09:15:04 +02:00
Matt DeTullio 5d6d795d60 Fixes a bug with group member administration 
Group owners were not able to remove any users from their group if they were the only owner.
 2014-03-10 22:56:26 -04:00
Dmitriy Zaporozhets d33d550e3e Merge pull request #6500 from tsigo/natural-tag-sorting 
Natural version sorting
 2014-03-10 17:27:23 +02:00
Dmitriy Zaporozhets b1ff8e31b1 Add ldap check in application_controller and internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:10:23 +02:00
Robert Speicher efd860d1da Remove extra whitespace 2014-03-10 03:44:49 -04:00
Robert Speicher 74d2085cdf Sort tag names using VersionSorter 2014-03-09 00:01:06 -05:00
Robert Speicher a37c679400 Remove arguments from grouped_options_refs 
Must have been left over from a previous revision, but the argument
wasn't used anywhere in the method.
 2014-03-09 00:01:06 -05:00
Ryan Mendivil 1c46a0d471 Fix grammar in zero_authorized_projects view 2014-03-08 10:33:28 -09:00
Jason Hollingsworth 9818775cad Check if any social providers are enabled. 2014-03-06 21:07:02 -06:00
Dmitriy Zaporozhets 8634d0d5c1 Sort projects by activity at group show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 18:31:08 +02:00
Jeroen van Baarsen e6ceec9d60 Renamed oldrev/newrev to before/after 2014-03-06 16:15:19 +01:00
Jeroen van Baarsen 4a251849cf Added newrev and oldrev to the hook data 2014-03-06 16:08:51 +01:00
Dmitriy Zaporozhets 694388dfbc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-06 15:50:18 +02:00
Dmitriy Zaporozhets 261f212b3b Use rails helper image-url for reference images in css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 11:05:00 +02:00
Dmitriy Zaporozhets 0004aafe37 Merge pull request #6473 from veonik/fix-readme-title 
Fixed readme title
 2014-03-06 10:21:41 +02:00
Robert Speicher 1688a29023 Add GFM autocompletion for MergeRequests 
Requested
[here](http://feedback.gitlab.com/forums/176466-general/suggestions/5507440-auto-complete-merge-requests-in-gitlab-markdown).
 2014-03-05 23:24:03 -05:00
Jeroen van Baarsen f096bd61bd Post-receive hook can also fire TagPushService 2014-03-05 22:10:35 +01:00
Jeroen van Baarsen 13d2bcc3b4 Created a basic Git Tag Push service 
This is the first version, and only has the most basic information about
the tag that is created.
 2014-03-05 21:23:49 +01:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks 
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
 2014-03-05 20:44:01 +01:00
Tyler Sommer e9942e5a79 Fixed readme page title 2014-03-05 11:23:21 -08:00
Nick HuancaandDmitriy Zaporozhets d02e129a54 added verify false on gitlab_ci integrations 
For those of us running self-signed in gitlab-ci it generates 500s SSL_verify errors if you don't have this.
 2014-03-05 13:23:44 +02:00
Dmitriy Zaporozhets f1d8efb770 Merge branch 'shell_new_style' into 'master' 
Use new style shell commands
 2014-03-05 10:45:46 +00:00
Dan Allen 4239e457ac Add .adoc file extension for AsciiDoc 
Add .adoc file extension for AsciiDoc as it's a very popular extension to use and the one recommended by the Asciidoctor project.
 2014-03-04 16:08:48 -07:00
Javier Castro b61f80babb Merge remote-tracking branch 'upstream/master' into fix-4305 2014-03-04 15:09:33 -03:00
Dmitriy Zaporozhets d0e73eeca1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-03 22:01:46 +02:00
Dmitriy Zaporozhets 6d71292830 Merge pull request #6453 from gitlabhq/link-to-dot-com 
Link to consolidated website with https links. Fixes #6017
 2014-03-03 19:38:30 +02:00
Pierre de La Morinerie ad278c4e74 Make the merge request notification emails more readable 
Emphasize the meaningful informations, and remove the less needed ones:

* Use "!" to identify a merge request
* Write the name of the commented file for diff notes
* Don't show the assignee in the "merged merge request" email
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 306744bbb0 Simplify the default layout of notification emails 
* Less margin: the content appears as the text of the message.

* Streamlined footer: everything on one line, with a small separator.

* Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display
the content of the message. Switching to a simpler layout fixes the
issue.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 7959455f4d Remove the header banner in notification emails 
Rationale:

* The link to the project is already displayed in the message footer.

* Streamlining: the content of the message is better emphasized.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie ec196fbbf2 Remove the quote-style around message in notification emails 
Rationale:

* In this notification email, the message is the most important content.
It should not be dimmed or smaller than the rest of the text.

* Now that all UI elements are removed, the message *is* the email. It
should be written as a standard email message, without styling.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie eeb011e34a Remove the author name from issue notes emails 
Rationale: the author name is now displayed in the email "From" field;
this information is no longer needed.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 8e421d2bcb Add the description to the "new issue" and "new merge request" emails 
Previously the content of the issue or merge request was missing from
the email.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie b59d105c0e Linkify the reference to the project in the notification emails footer 
Rationale:

* Consistency: the link is always at the same place.

* Streamlining: it allows to remove the header banner, now that the
project url can be accessed from another place.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie edd6028bdb Remove custom link to target in notification emails 
Every email has a different way of showing a link to the discussion on
the website. We don't need this anymore, as we now have a standard
"View in GitLab" link in the footer of every email.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 7ba0b502d3 Add a "View in GitLab" link in notification emails 
When an email notification concerns a specific object (issue, note,
merge request, etc.), add a link to the footer of the email that opens
the item's page in a web browser.

Rationale:

* The link is predictable: always the same text, always at the same
location, like any reliable tool.

* It allows to remove the inline-title in many emails, and leave only
the actual content of the message.
 2014-03-03 16:58:44 +01:00
Dmitriy Zaporozhets e6e0ad4e5e Merge branch 'feature/reopen_mr' into 'master' 
Feature: reopen closed merge request
 2014-03-03 13:18:48 +00:00
dosire 2135da1466 Also make the blog https. 2014-03-03 09:28:28 +01:00
Jacob Vosmaer 2b816075dc Replace backticks with Gitlab::Popen 2014-03-03 08:40:29 +01:00
lol768 39bb54feb3 Fix registration error info typo 2014-03-02 18:45:38 +00:00
Jason Blanchard 3ada1d7ec3 Added option to remove issue assignee on project issue page and issue edit page 2014-03-02 13:10:45 -05:00
dosire c3d5503984 Link to consolidated website with https links. Fixes #6017 2014-03-02 18:03:37 +01:00
Dmitriy Zaporozhets a9dcfd851f Merge pull request #6308 from jvanbaarsen/help-to-markdown 
Convert all help files to markdown files in doc directory
 2014-03-01 15:02:07 +02:00
Dmitriy Zaporozhets 36b065e634 Feature: reopen closed merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:43:16 +02:00
Dmitriy Zaporozhets 110585c503 Hide mr close button for comment form if merge request was closed or inline comment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:23:08 +02:00
Dmitriy Zaporozhets b7072ff0de FIx state-label align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:14:43 +02:00
Jeroen van Baarsen 564c37d9b6 Moved all the help files to markdown files: 
Files moved:
* Workflow
* help/ssh
* help/webhooks
* help/system_hooks
* help/public_access
* help/permissions
 2014-02-28 19:30:13 +01:00