Commit Graph
10509 Commits
Author SHA1 Message Date
Marin Jankovski 751d267f29 Create required issue param for new action. 2014-07-01 14:03:49 +02: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
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
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
Dmitriy Zaporozhets 16a0a4aecc Note strong_params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 16:49:22 +03:00
Dmitriy Zaporozhets 98ba075c32 User model to strong params. Comment other attr_accessible to let tests run
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 15:11:45 +03:00
Jacob Vosmaer b5007c1565 Rename MergeRequest#lock! to #lock_mr!
As a warning from the StateMachine gem points out to us, there already
exists a method ActiveRecord#lock!. This change renames the `lock` and
`unlock` events defined on MergeRequest to `lock_mr` and `unlock_mr`.
2014-06-26 14:09:17 +02:00
Dmitriy Zaporozhets 3a21c904dd Use strong params for 5 more models
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 15:00:09 +03:00
Dmitriy Zaporozhets 04516027df Project services to strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 14:49:09 +03:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets 024e0577c6 Add html meta tag with software description
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 12:56:15 +03:00
Dmitriy Zaporozhets 7abd1fd64f Merge branch 'small-changes' into 'master'
Small changes
2014-06-26 09:17:33 +00:00
Dmitriy Zaporozhets 548209c597 Merge branch 'rename-home-tabs' into 'master'
Rename home tabs

* Dashboard Home -> Activity
* Project Home -> Activity
* Group Home -> Activity
* Profile Home -> Profile
* Admin Home -> Dashboard

Related to #1351
2014-06-26 09:16:55 +00:00
Dmitriy Zaporozhets 1e3c9eb450 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 12:05:06 +03:00