home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +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 57f1ff5dc0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-01 15:58:09 +03:00
Dmitriy Zaporozhets 0ab708dfa6 Merge branch 'title_for_truncated_names' into 'master' 
Title for truncated names

Fixes #1391
 2014-07-01 12:57:11 +00:00
Sytse Sijbrandij b5543be19d Move standard login form to the auth settings where users expect them. 2014-07-01 14:49:40 +02:00
Marin Jankovski 815fbbbf91 Add title html option to issue and mr links in milestones to show title on hover. 2014-07-01 14:16:37 +02:00
Marin Jankovski 751d267f29 Create required issue param for new action. 2014-07-01 14:03:49 +02:00
Dmitriy Zaporozhets b88401c9aa Merge branch 'mail_template' into 'master' 
Mail template changes (add the command line for http) when a project is moved in an other namespace.

See subject, it is just the addition of the set-url for http(s) origin in the mails.
 2014-07-01 11:48:47 +00:00
Dmitriy Zaporozhets f71e68dcad Merge branch 'images-in-emails' into 'master' 
Limit the width of images in emails

In notification emails, large inline images can exceed the width of the viewport. This ensure that large images are resized to fit within the mail client window.
 2014-07-01 11:47:50 +00:00
Dmitriy Zaporozhets f12967ced7 Merge branch 'bugfix/304/dashboard_feed_note_urls' into 'master' 
Fix Dashboard Feed URLs For Notes

This MR fixes issue #304 by updating the app/helpers/events_helper.rb event_feed_url() function to also return a URL for the various types of notes. Without this change, no URL is returned, which causes any note events on the feed to link directly back to the feed.
 2014-07-01 11:46:23 +00:00
Dmitriy Zaporozhets 5be5b23f43 Merge branch 'css-fix' into 'master' 
CSS fix: 1px border on hover of last item in tree view

I messed up my fork repository and hat to recreate it. So I closed MR !77 and created this one instead. Sorry for any inconvenience.

@dzaporozhets: I changed the code and just added one line as you suggested.

This merge request fixes issue #101.
 2014-07-01 11:42:27 +00:00
Dmitriy Zaporozhets 8fb76a8308 Merge branch 'group_milestones' into 'master' 
Group milestones
 2014-07-01 07:18:15 +00:00
Dmitriy Zaporozhets bcfcd243a6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-06-30 20:06:23 +03:00
Dmitriy Zaporozhets 4f0bfdb500 Merge branch 'strong-parameters' into 'master' 
Strong parameters

Replace protected_attributes with strong parameters.
Fixes #1340
 2014-06-30 17:01:22 +00:00
Marin Jankovski 3e52517da1 Add feature tests for group milestone. 2014-06-30 16:18:26 +02:00
Dmitriy Zaporozhets 4967c08786 Fix signup and project visibility 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-30 16:43:32 +03:00
Marin Jankovski eb5182ac8d Add group service spec. 2014-06-30 15:00:12 +02:00
Marin Jankovski fdbf77ef99 Fix styling issues. 2014-06-30 13:27:17 +02:00
Dmitriy Zaporozhets 13f017f01b Fix user model specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-30 14:22:09 +03:00
Dmitriy Zaporozhets 8daa69a3eb Enable snippets by default in project factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-30 14:02:52 +03:00
Marin Jankovski d3796b84f8 Show all issues and merge requests that could be considered opened or closed, includes reopened and merged. 2014-06-30 12:41:27 +02:00
Marin Jankovski d145f09cd6 Correct authorization for group milestones. 2014-06-30 11:38:03 +02:00
Marin Jankovski e66a8b4cda Move milestone link in group head, 2 column milestone for MR and issues. 2014-06-30 11:13:24 +02:00
Marin Jankovski c223fb1a96 Start building group milestone show page. 2014-06-30 09:45:16 +02:00
Marin Jankovski b6425f33bc Get one group milestone based on milestone title. 2014-06-30 09:44:30 +02:00
Marin Jankovski f0af302c83 Close and reopen group milestones. 2014-06-30 09:44:30 +02:00
Marin Jankovski 4ca8a175a2 Filter group milestones. 2014-06-30 09:44:30 +02:00
Marin Jankovski 0723bf1afa Move group milestone processing from service to model. 2014-06-30 09:44:30 +02:00
Marin Jankovski 8e8c074205 Reuse existing milestones counting. 2014-06-30 09:44:30 +02:00
Marin Jankovski 58570880f0 Create group milestones service. 2014-06-30 09:44:30 +02:00
Marin Jankovski e1afea777a Show title of milestone. 2014-06-30 09:44:30 +02:00
Marin Jankovski aaba993352 Skeleton of the group milestone index page. 2014-06-30 09:44:30 +02:00
Marin Jankovski ca6fd8841e Add group milestones routes and controller. 2014-06-30 09:42:28 +02:00
Sytse Sijbrandij 2f962a40e8 Merge pull request #7170 from cirosantilli/add-trailing-newlines 
[minor-refactor] Add trailing newline to all text files.
 2014-06-30 09:41:06 +02:00
Dmitriy Zaporozhets 76e36dd253 Merge branch 'regression-tweet-links-to-issue' into 'master' 
Regression tweet links to issue

/cc @job @marin @jacobvosmaer
 2014-06-27 18:11:19 +00:00
Jo Hund df3c466e37 Don't remove trailing newline when editing a file in web UI editor: 
* populate ACE editor content via API instead of HTML element inner text (to preserve trailing whitespace).
* remove hack in EditTreeController#preview that replaces any removed \n.

Fixes #5936
 2014-06-27 10:50:36 -07:00
Sytse Sijbrandij 32c96d5297 Merge branch 'add-image-to-backup-task' into 'master' 
Add image to backup task
 2014-06-27 13:02:51 +00:00
Sytse Sijbrandij 74039eb083 Add banner image to backup task. 2014-06-27 15:02:07 +02:00
Sytse Sijbrandij 379ffbb262 Link to regression issue from the tweet. 2014-06-27 10:46:52 +02:00
Dmitriy Zaporozhets 9231b91a40 Fix mentionable spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-27 00:37:04 +03:00
Dmitriy Zaporozhets f0de4b539f Fix project update specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-27 00:28:32 +03:00
Dmitriy Zaporozhets ab29ddcfc4 Enable snippets for test project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-27 00:01:16 +03:00
Dmitriy Zaporozhets 0f550aa386 Remove mass assgnment specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:57:55 +03:00
Dmitriy Zaporozhets 76dca50abe Fix password change. Fix test settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:40:08 +03:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Dmitriy Zaporozhets 2acde87e0d Project hook, milestone, snippet strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:51:11 +03:00
Dmitriy Zaporozhets e382c8dfc7 team member and hook strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:45:33 +03:00
Dmitriy Zaporozhets f86afb732b Fix dev env. Fix MR creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 18:40:13 +03:00
Dmitriy Zaporozhets 7a7c01b92a Merge branch 'lock_warning' into 'master' 
Rename MergeRequest#lock! to #lock_mr!
 2014-06-26 15:14:17 +00:00
Marvin Frick ec61dfdc8c adds rake task to clean up deleted LDAP users 2014-06-26 16:09:15 +02:00
Dmitriy Zaporozhets cb74c014ea Key strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 17:00:05 +03:00
Dmitriy Zaporozhets 8f60b5b4fc Group and Event strong_params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 16:57:10 +03:00