home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,598 Commits 48 Branches 340 Tags
cb4d8eff4cb158fbef4d59bf64e04e776e29eaed
Commit Graph
1207 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d3fcb60e43 Merge branch 'flash_message_after_signup' into 'master' 
Flash message after signup

Fixes #1366

See merge request !948
 2014-07-04 14:00:41 +00:00
Marin Jankovski 87f89bc970 Redirect to sign in page after signup, this will show the correct flash message. 2014-07-04 14:19:59 +02:00
Marin Jankovski 3b5722bca9 Improve performance, ordering and pagination for group milestones. 2014-07-04 11:57:24 +02:00
ahmyi 4d051e987f Archive with content-length header 2014-07-03 11:05:51 +08:00
ahmyi dce6cb2d84 Content-length defined in header response 
Enable Content-Length to be defined in header response
 2014-07-03 10:57:01 +08:00
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
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 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 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 ca6fd8841e Add group milestones routes and controller. 2014-06-30 09:42:28 +02: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 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
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 3900eee30e Increase commit log amount for tree view from 10 to 25 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:29:39 +03:00
Dmitriy Zaporozhets 907548a0fb dont render discussion diff unless note is for diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 10:14:35 +03:00
Dmitriy Zaporozhets 5eb734905c Merge branch 'oauth_errors' into 'master' 
Oauth errors page
 2014-06-24 14:08:28 +00:00
Marin JankovskiandDmitriy Zaporozhets 49c9e8ec02 Use an error page when oauth fails. 2014-06-24 15:30:29 +03:00
Marin JankovskiandDmitriy Zaporozhets f40e87a03b Return better error when account exists when attempting oauth account create. 2014-06-24 15:30:29 +03:00
Dmitriy Zaporozhets 30912c75b8 Improve merge request comments 
When add diff note on 'Changes' page - and then go to 'Discussions' tab
you will not see this discussion unless you reload a page. This commit
fixes it by rendering discussion on 'Discussion' page as soon as you
submit comment on 'Changes' page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 14:57:59 +03:00
Dmitriy Zaporozhets 094e5efb4c Merge pull request #6992 from skv-headless/project_commits_sql_optimization 
notes count in 1 query  for mr and commits
 2014-06-24 10:38:50 +03:00
Dmitriy Zaporozhets 7454ad19e9 Merge branch 'at_mention_all_project_members' into 'master' 
At mention all project and group members
 2014-06-24 07:12:37 +00:00
Dmitriy Zaporozhets d52df8e730 Merge branch 'issues-filter-by-description' into 'master' 
Issues filter by description

In Issues section of any project there is a filter box, which by default says 'Filter by title or description' - so this behaviour is desired. But in fact only filter by title works and filter by description DOESN'T work. This fix adds description fitlering.
 2014-06-24 07:04:01 +00:00
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Marin Jankovski 185da5f976 Make sure that at mentioning all properly notifies. 2014-06-23 12:28:57 +02:00
Marin Jankovski 63c1cdce42 Show @all in autocomplete list. 2014-06-23 11:54:58 +02:00
Marin Jankovski 37425618bc Add option for admin to remove users secondary emails. 2014-06-23 09:45:26 +02:00
Dmitriy Zaporozhets 5aaa35656e Merge branch 'redirect_after_login' into 'master' 
Redirect after login
 2014-06-23 06:38:24 +00:00
Dmitriy Zaporozhets d12b910d20 Merge branch 'remove-observers' into 'master' 
Remove observers from application

Part of #1133
 2014-06-23 06:36:08 +00:00
Marin Jankovski 26d1bd7c2a Set return url as param. 2014-06-19 14:20:25 +02:00
Dmitriy Zaporozhets f3369e3a00 Fix project trasnfer for admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-19 13:20:42 +03:00
Marin Jankovski a1eb1ad168 Redirect back to current page after sign in. 2014-06-19 11:24:59 +02:00