home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,355 Commits 48 Branches 340 Tags
f036d4095e5700a1663ce3429b0342fa813c3c7a
Commit Graph
2963 Commits
Author SHA1 Message Date
Robert Speicher f036d4095e Fix spec broken by updated Devise translations 2015-10-01 23:46:43 -04:00
Robert Speicher b8ff38b1d4 Refactor PasswordsController to use before_actions 2015-10-01 21:47:27 -04:00
Robert Speicher ad7ad8745a Add User#recently_sent_password_reset? 2015-10-01 21:41:56 -04:00
Robert Speicher 9052f13b31 Remove specs for "login after reset" 
We're now using default Devise behavior, so these tests were redundant.
 2015-09-30 16:15:56 -04:00
Robert Speicher ceb21cc49f Update feature spec 2015-09-30 15:47:48 -04:00
Robert Speicher 292bca0546 Only allow password reset emails once per minute 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611
 2015-09-30 15:38:21 -04:00
Robert Speicher 3a4274e19e Take advantage of Devise.sign_in_after_reset_password 2015-09-30 14:35:00 -04:00
Dmitriy Zaporozhets 048dd5e458 Merge branch 'merge-ci-data' into 'master' 
Use data stored in projects instead of ci_projects

- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.

/cc @dzaporozhets 

See merge request !1404
 2015-09-30 16:05:33 +00:00
Kamil Trzcinski ad765353f6 Fix sometimes failing tests 2015-09-30 12:51:03 +02:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects 
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
 2015-09-30 12:48:40 +02:00
Dmitriy Zaporozhets 3d9a7cdb4b Refactor CI helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:26:40 +02:00
Dmitriy Zaporozhets 87240e989b Move CI project settings page to CE project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 16:07:44 +02:00
Dmitriy Zaporozhets 2c3355f958 Merge branch 'ci-commits-to-projects' into 'master' 
Make Ci::Commits belong to Project instead of Ci::Project



See merge request !1455
 2015-09-29 11:44:07 +00:00
Kamil Trzcinski 0d877d91e7 Make ensure_gitlab_ci_project return ci_project or create a new one 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0f3deac362 Fix tests 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 0fa4ab5fd8 Rename commits to ci_commits 2015-09-29 10:47:04 +02:00
Kamil Trzcinski 8f8efcfa00 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 2c1f7ccac8 Fix register_build_service tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 0e33814708 Fix tests 2015-09-29 10:47:03 +02:00
Kamil Trzcinski 30c78e70cb WIP 2015-09-29 10:47:03 +02:00
Dmitriy Zaporozhets 2a0d4e7200 Move CI triggers page to project settings area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-29 10:37:31 +02:00
Dmitriy Zaporozhets 037defc7de Move CI variables page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 17:19:20 +02:00
Dmitriy Zaporozhets b656419591 Merge branch 'move-runners-page' 2015-09-28 16:47:18 +02:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Dmitriy Zaporozhets c876bfa0f2 Add missing spec file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 11:01:45 +02:00
Dmitriy Zaporozhets 92f8e0fd7e Finish move of runners page to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-28 10:14:53 +02:00
Stan Hu 0383afc66a Add user preference to view project activity and starred project activity as default dashboard 
Closes #2662
 2015-09-26 08:46:05 -07:00
Stan Hu d5e73ae634 Merge branch 'hook-api-updates' into 'master' 
Hook api updates



See merge request !1429
 2015-09-24 23:28:59 +00:00
Ben Boeckel 869bab9d68 hooks: improve tests for hook API 2015-09-24 16:59:16 -04:00
Robert Speicher 817a60894a Merge branch 'get-ci-token-from-ci-projects' into 'master' 
Get CI token from ci projects

This fixes problem when GitLabCiService had different token than stored
in Ci::Project.

See merge request !1425
 2015-09-24 19:41:58 +00:00
Kamil Trzcinski 04c4445ae0 Test grace auth against gitlab_ci_project with token 2015-09-24 20:19:27 +02:00
Robert Speicher ce19e1739e Update stub syntax 2015-09-24 14:12:25 -04:00
Kamil Trzcinski 5d69bc656a Fix grack auth spec 2015-09-24 17:47:57 +02:00
Kamil Trzcinski 297f969bab Fix specs 2015-09-24 16:25:40 +02:00
Pavel Forkert 3dec9dc4a3 Clarify spec title explanation 2015-09-24 16:40:21 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user 
Closes #2291
 2015-09-24 16:14:16 +03:00
Dmitriy Zaporozhets 2759b13ae9 Remove CI dashboard 
With CI status integrated at GitLab projects page there is no reason to keep it
anymore.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-24 15:10:25 +02:00
Dmitriy Zaporozhets fd39414408 Merge branch 'remove-routes-helper' into 'master' 
Fix Slack notification URL and remove the usage of Ci::RoutesHelper

Fix for #2644

/cc @dzaporozhets @rspeicher 

See merge request !1391
 2015-09-24 09:53:04 +00:00
Dmitriy Zaporozhets 24e8445af6 Merge branch 'move-ci-charts' into 'master' 
Move CI charts to project graphs area

Part of #2594 

Should be merged after !1405 


Same page but moved to another place 

![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png)


See merge request !1407
 2015-09-24 09:03:13 +00:00
Douwe Maan ae3fba6cfa Merge branch 'rs-help-page' into 'master' 
Help page improvements

- Only signed-in users can see version information
- Add "Community Edition" text so the header is
  less barren when version information is hidden
- Minor copy edits
- Make all "Quick help" link text the entire body
  of the link. Prior, it wasn't obvious which part
  of each item was an actual link.

Closes #2721 

See merge request !1415
 2015-09-24 07:51:52 +00:00
Douwe Maan 4bf1e85cce Merge branch 'fix-network-graph-refs' into 'master' 
Remove git refs used internally by GitLab from network graph

GitLab 8.0 removed satellites and started using git refs that began with `refs/merge-requests/XXX` and `refs/tmp/XXX`, which showed up in an ugly way in the network graph:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/150eb7ae5f07f0d4793589b5eac462db/image.png)


Closes #2702

See merge request !1410
 2015-09-24 07:43:53 +00:00
Dmitriy Zaporozhets ea58395525 Merge branch 'master' into move-ci-charts 2015-09-24 09:40:32 +02:00
Douwe Maan a58c6e9a95 Merge branch 'cleanup-ci-dashboard' into 'master' 
Cleanup ci dashboard

Part of #2594. Based on !1403

* remove rendering GitLab projects with not enabled CI on CI dashboard
* remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`)
* simplify the projects query for CI dashboard 

See merge request !1405
 2015-09-24 07:32:29 +00:00
Robert Speicher 45824aabc6 Allow non-admin users to see version information 
We want users to know what features they have available (and to pressure
their admins to upgrade).
 2015-09-23 17:18:15 -04:00
Robert Speicher be142e6bd6 Move the version_check_enabled check from view to helper 2015-09-23 16:28:51 -04:00
Robert Speicher 48cfad9013 Add a view spec (gasp!) for help/index 2015-09-23 16:20:58 -04:00
Robert Speicher 7bca8745fd Merge branch 'fix-ldap-attributes' into 'master' 
Fix LDAP attribute mapping

See merge request !1408
 2015-09-23 17:29:25 +00:00
Robert Speicher 0175769aa8 Merge branch 'fix-markdown-truncation-removing-links' into 'master' 
Fix cases where Markdown did not render links in activity feed

HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.

Closes #2586

See merge request !1401
 2015-09-23 17:20:37 +00:00
Stan Hu 150fb81ef9 Remove git refs used internally by GitLab from network graph 
Closes #2702
 2015-09-23 08:56:32 -07:00