home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets caa876af90 Improve file title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 16:01:13 +03:00
Marin JankovskiandDmitriy Zaporozhets bb89661365 Better name for config variable. 2014-05-13 15:34:00 +03:00
Marin JankovskiandDmitriy Zaporozhets 6b04a5f910 Add support for Jira ticket mentions in format JIRA-123. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG-EE
 2014-05-13 15:33:38 +03:00
Dmitriy Zaporozhets 5ddba39eef Merge branch 'improve-violet-theme' into 'master' 
Improve violet theme
 2014-05-13 12:21:28 +00:00
Dmitriy Zaporozhets 51280fc76c Improve violet theme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 15:15:46 +03:00
Dmitriy Zaporozhets 1f1c59b61d Merge pull request #6778 from dblessing/feature/mr_labels 
Merge Request Labels
 2014-05-13 14:43:46 +03:00
Drew Blessing 5f25cdfe19 Implement Merge Request Labels 2014-05-13 06:41:36 -05:00
Dmitriy Zaporozhets 0c62170865 Merge branch 'api-mr-merge' into 'master' 
Accept merge request API

This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.

Fixes internal issue #1166
 2014-05-13 11:27:19 +00:00
Dmitriy Zaporozhets 2d2b2da45a More tests for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 13:20:10 +03:00
Dmitriy Zaporozhets 17858d49f6 Merge pull request #6109 from jamit/master 
Added email threading for update emails on issues and merge requests
 2014-05-13 12:35:33 +03:00
Dmitriy Zaporozhets 3ea4bf4891 Merge pull request #6045 from jacargentina/fix-4305 
Temporary fix for #4305: Cant preview attached png images on notes; attachment.secure_url returns an url which is accessible
 2014-05-13 12:29:54 +03:00
Dmitriy Zaporozhets 0401e19558 Merge pull request #6385 from cirosantilli/72-char-commit-msg 
Commit message textareas have 72 char mark line.
 2014-05-13 12:29:28 +03:00
Dmitriy Zaporozhets 0fd12a786a Merge pull request #6825 from sue445/feature/post_automerge 
Fix can not automerge when description is too long
 2014-05-13 12:26:42 +03:00
Dmitriy Zaporozhets e0fdb4262a Merge pull request #6823 from milgner/api_expose_project_archived_status 
Expose archive status of projects in API
 2014-05-13 12:24:44 +03:00
Dmitriy Zaporozhets 6d65afb3c4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-13 11:38:18 +03:00
Dmitriy Zaporozhets 8b05490f37 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-13 11:38:07 +03:00
Dmitriy Zaporozhets 1a57a1e49f Merge branch 'use_ldap_uid_as_username_instead_of_first_part_of_email_address_on_user_creation' into 'master' 
Use ldap uid as username instead of first part of email address on user creation
 2014-05-13 08:32:10 +00:00
Dmitriy Zaporozhets 5c69022c6f Merge pull request #6959 from dtan4/fix-dead-links 
Fix dead links in ruby.md
 2014-05-13 11:14:56 +03:00
Dmitriy Zaporozhets ab032256da Add some tests for merge API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-13 11:01:40 +03:00
Dmitriy Zaporozhets d85cc4c782 Merge branch 'api-wrapper' into 'master' 
Api wrapper
 2014-05-13 07:18:16 +00:00
dosire f0e46ec917 Let people know that Nihad Abbasov made a nice api wrapper. 2014-05-13 07:58:12 +02:00
Dmitriy Zaporozhets 5880d7df62 Docs for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 18:01:22 +03:00
Dmitriy Zaporozhets 0c73e66643 Specify error codes for merge api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 17:51:43 +03:00
dtan4 78897ee2d2 Fix dead links in ruby.md 2014-05-12 22:49:32 +09:00
Dmitriy Zaporozhets fe6d392236 Draft API method for merge MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 16:34:41 +03:00
Dmitriy Zaporozhets 68b89142aa Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-12 15:30:07 +03:00
Dmitriy Zaporozhets d88b022e8d Merge branch 'changelog-satellite' into 'master' 
Changelog satellite
 2014-05-12 12:29:36 +00:00
dosire 2efcd3013a Add changelog entry for satellite clean. 2014-05-12 13:57:20 +02:00
Sytse Sijbrandij b6ca6623ab Merge branch 'monthly-revision' into 'master' 
Monthly release doc revision

/cc @sytse @jacobvosmaer @marin @dzaporozhets @marc
 2014-05-12 11:16:32 +00:00
Jacob Vosmaer 7ec9777a86 Merge branch 'master' into 'master' 
Fix typo in doc/install/requirements.md
 2014-05-12 10:19:56 +00:00
Dmitriy Zaporozhets 8b9b34f842 Mention 2 step MR in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-12 13:06:25 +03:00
Dmitriy Zaporozhets a54408b9ed Merge branch 'expose_visibility_in_project_create_service_hook' into 'master' 
Expose project visibility in system service hooks

Our gitlab installation is currently setup with a system hook to ping our hubot. Currently whenever a project is created, hubot announces this, regardless of project visibility. It didn't really make sense for everyone to see this, and as the project visibility wasn't exposed in the JSON hook output, I thought I'd add it in!

As far as I'm aware, tests still run and pass OK. I'm not exactly rails savvy though, so any pointers/fixes/etc, please let me know!
 2014-05-12 09:45:17 +00:00
Alex 31b0e14981 Adding project visibility to system hooks 2014-05-12 10:23:24 +01:00
Julien Pivotto 566badbaee Use uid as username when creating user with LDAP 
Without that commit, each user created by a LDAP login would have the
first part of their email address as nickname.

This is not useful for LDAP, where a uid attribute is already set.
 2014-05-12 07:30:35 +02:00
Dmitriy Zaporozhets c355b9abfe Merge pull request #6951 from Azaret/fix_dark_css_rules_conflict 
Fix css rules conflict between .dark & a.dark classes
 2014-05-11 20:36:16 +03:00
sue445 a3d8be09c6 Fix can not automerge if description is too long 2014-05-11 23:50:14 +09:00
Pascal Herbert 7477dd7a7c Fix typo 2014-05-11 13:23:51 +00:00
Dmitriy Zaporozhets 4ba5acd238 Merge branch 'link-to-installation-doc' into 'master' 
Link to installation doc
 2014-05-10 18:34:19 +00:00
dosire 049b63473f Link to the installation doc so people viewing on other locations can click the link. 2014-05-09 19:34:25 +02:00
Gregoire Daussin ea696805a7 Fix css rules conflict between .dark & a.dark classes 2014-05-09 17:58:23 +02:00
Dmitriy Zaporozhets 3b34084bde Fix notify specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-09 09:46:23 +03:00
Dmitriy Zaporozhets b8115e76a4 Merge branch 'backup_wiki_skip_bug' into 'master' 
Fix wiki backup skip bug
 2014-05-09 06:40:19 +00:00
Jacob Vosmaer 0f29ccffd2 Backup wiki repo even if the main repo is empty 
This fixes a bug where wiki repositories for projects with an empty main
repository would not get backed up.
 2014-05-08 22:50:48 +02:00
Dmitriy Zaporozhets 23ae3911aa Merge branch 'mixin-cleanup' into 'master' 
Mixin cleanup

* Remove old mixins
* add issue box shadow
* change color for network graph box
 2014-05-08 20:01:52 +00:00
Dmitriy Zaporozhets 9e11153721 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-08 21:50:14 +03:00
Dmitriy Zaporozhets 32875f9aaf Merge pull request #6937 from chamill/master 
Provide fallback for missing `name` value.
 2014-05-08 21:49:59 +03:00
Dmitriy Zaporozhets 058c48845b Merge branch 'fix_merge_request_emails' into 'master' 
Remove markdown syntax from notification emails

Merge request notifications once again gained markdown syntax 😄 In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c5 and it was recently changed back to use the markdown style.
 2014-05-08 18:36:32 +00:00
Dmitriy Zaporozhets 8c1201efac Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-08 21:31:43 +03:00
Dmitriy Zaporozhets 4ca1a29de8 Merge pull request #6934 from skv-headless/ctrl_enter_form_submit 
submit notes forms by pressing ctrl+enter
 2014-05-08 21:31:25 +03:00
Dmitriy Zaporozhets aa5f306d11 Merge pull request #6860 from hszcg/dev 
Add support for side-by-side inline comments
 2014-05-08 21:23:44 +03:00