home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Willem van der Meer 26b14dd2d5 Get uid from auth instead of info hash 
As found in the omniauth specs: https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
 2014-09-01 16:31:27 +02:00
Jan-Willem van der Meer 92a9964940 Add basic find / create specs for LDAP user 2014-09-01 15:30:46 +02:00
Dmitriy Zaporozhets 4102eb3b85 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 16:20:10 +03:00
Dmitriy Zaporozhets 83a588c316 Merge branch 'comment-and-close' into 'master' 
Comment and close

Fixes #1240

See merge request !1055
 2014-09-01 13:19:38 +00:00
Dmitriy Zaporozhets 99425a124c Post comment when hit close/reopen btn in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 15:37:53 +03:00
Jan-Willem van der Meer ca17e4b7ad Remove duplicate method 2014-09-01 14:30:31 +02:00
Jan-Willem van der Meer 262276c5f5 Ensure oath callbacks without a nickname work (google) 2014-09-01 14:26:10 +02:00
Jan-Willem van der Meer 5801d520a7 Handle user creation if email is not provided 
This fixes #1541
 2014-09-01 14:05:01 +02:00
jubianchiandjubianchi 4fdd21685c Filters issues by state via API 2014-09-01 13:51:40 +02:00
Jan-Willem van der Meer 6143cef4c4 Handle user creation if email is not provided 
This fixes #1541
 2014-09-01 13:49:16 +02:00
Ciro Santilli 57fddea8bb Add users with predictable username and password 
to development seed.
 2014-09-01 13:48:35 +02:00
Dmitriy Zaporozhets 31773f4dd7 Merge branch 'milestone_percentage' into 'master' 
Show milestone percentage in detail page, fixes #485

#### What does this MR do?

This MR adds the percentage count also to the milestone detail page.

##### Why was this MR needed?

Currently, this is only shown in the overview list.

##### What are the relevant issue numbers?

#485

###### Screenshots

![Screenshot 2014-08-17 21.14.27](https://gitlab.com/uploads/razer6/gitlab-ce/27e6f20bf2/Screenshot_2014-08-17_21.14.27.png)

See merge request !170
 2014-09-01 11:35:43 +00:00
Dmitriy Zaporozhets 6dd140047f Merge branch 'search-issues-spinach' into 'master' 
Added Spinach tests for search issues by issue-description

Added Spinach tests for 'search issues by description' feature which was added to Changelog 7.1 for feature "Filter by description on Issues#index page"

See merge request !172
 2014-09-01 11:35:09 +00:00
Dmitriy Zaporozhets 2dc31b76aa Merge pull request #7409 from robbytaylor/feature/remove-redundant-spans 
Removed redundant spans
 2014-09-01 14:14:38 +03:00
Dmitriy Zaporozhets 94e7138bdb Merge pull request #7406 from robbytaylor/feature/group-row-padding 
Moved padding from li to a in dashboard groups / projects listing
 2014-09-01 14:04:12 +03:00
Dmitriy Zaporozhets 20dbc2a139 Merge pull request #7425 from Razer6/remove_dup_javascript 
Remove duplicated setupNoteForm method
 2014-09-01 14:03:10 +03:00
Jan-Willem van der Meer 0ec4abf73c Use local vars for tests 2014-09-01 13:02:41 +02:00
Dmitriy Zaporozhets a28fe934d6 Merge pull request #7628 from zzet/update_markdown 
Update redcarpet gem
 2014-09-01 14:01:19 +03:00
Jan-Willem van der Meer 0c34fa3ea0 Add tests for finding an oauth authenticated user 2014-09-01 12:59:04 +02:00
Dmitriy Zaporozhets 8235d3ecdf Merge pull request #7659 from Razer6/feature/shortcuts 
Awesome keyboard shortcuts for GitLab
 2014-09-01 13:47:44 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Sytse Sijbrandij ca139e8c78 Rewrite this section after suggestion from Achilleas. 2014-09-01 11:26:47 +02:00
Dmitriy Zaporozhets 4198b58a8c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-01 12:19:17 +03:00
Ciro Santilli 81336bd2b5 Add permalink to fixed SHA URL on blob view. 2014-09-01 10:26:47 +02:00
Sytse Sijbrandij fe3762fd0a Fixed items mentioned by Achilleas Pipinellis, thanks. 2014-09-01 10:19:22 +02:00
Sytse Sijbrandij 1034dbdabf Fix spelling mistakes, thanks Achilleas Pipinellis and Stephan van Leeuwen. 2014-08-31 10:59:13 +02:00
Jeroen van Baarsen 174c00cf2c Merge pull request #7428 from bbodenmiller/patch-2 
[Documentation] add prepare for update details to 5.1 to 6.0 guide
 2014-08-31 10:46:50 +02:00
Robert Schilling e78b2b9040 Merge branch 'double_quotes_empty_project' into 'master' 
Modify empty project instructions to use double quotes for commit mesage

Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/6006904-modify-instruction-to-use-double-quotes-for-windo

See merge request !179
 2014-08-31 07:41:38 +00:00
Ben Bodenmiller 5e2bce0fef change git to git bin path 2014-08-30 17:09:32 -07:00
Ben Bodenmiller 44185ace11 add prepare for upgrade section 
helps detect and correct issues that may occur during upgrade before
they have already occurred. easier to address issues before you start
upgrade process.
 2014-08-30 17:04:45 -07:00
Achilleas Pipinellis a870bc9ddf Modify empty project instructions to use double quotes for commit msg. 
http://feedback.gitlab.com/forums/176466-general/suggestions/6006904-modify-instruction-to-use-double-quotes-for-windo
 2014-08-31 01:08:01 +03:00
Sytse Sijbrandij a94ab6b916 Fix spelling mistakes, thanks Nico Hamm. 2014-08-30 11:35:51 +02:00
Dmitriy Zaporozhets 1d04a6fda7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-30 10:17:07 +03:00
Dmitriy Zaporozhets 14f5199cdc Merge branch 'feature-ldap-tests' into 'master' 
Feature ldap tests

Move specs to proper places. Relates to #154

This is already mergeable, will continue in a new branch for additions & refactorings.

See merge request !1053
 2014-08-30 07:16:45 +00:00
Dmitriy Zaporozhets cb71b26353 Merge branch 'ldap_allow_email' into 'master' 
Avoid ldap.allow_username_or_email_login issues

See merge request !1016
 2014-08-30 07:15:31 +00:00
Dmitriy Zaporozhets 0ef9ee18b1 Merge pull request #7639 from PeterDaveHello/patch-1 
make CI build faster
 2014-08-30 10:07:39 +03:00
Kevin Boyd 75b0ef82ba Fine-tune the Remove Project redirect. Now it redirects to admin_projects_path and shows a flash message confirming the action has been taken. 2014-08-29 15:56:26 -07:00
Robert Schilling d7b66e60d2 Merge pull request #7642 from cirosantilli/patch-5 
Comment typo.
 2014-08-29 21:49:03 +02:00
Charles Bushong 4cca1b050a Adding in snippet search functionality 
http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
 2014-08-29 15:32:07 -04:00
Ciro Santilli af7b19003c Comment typo. 2014-08-29 20:11:57 +02:00
Robert Schilling 8a7d10af23 Merge pull request #7641 from cirosantilli/patch-4 
Comment typo.
 2014-08-29 20:08:51 +02:00
Ciro Santilli 5317c26cf7 Comment typo. 2014-08-29 19:35:04 +02:00
Robert Schilling 48d8f993c3 Merge pull request #7640 from PeterDaveHello/patch-2 
Use svg instead of png to get better image quality
 2014-08-29 18:52:49 +02:00
Peter Dave Hello 02ee3a53a0 Use svg instead of png to get better image quality 2014-08-30 00:50:44 +08:00
Peter Dave Hello 09f83de297 make CI build faster 2014-08-30 00:44:56 +08:00
Jan-Willem van der Meer 0d5ae2802e Move and rename ldap / oauth specs 2014-08-29 17:30:42 +02:00
Dmitriy Zaporozhets f2befb6934 Merge pull request #7221 from mcmillion/fix-issue-comment-rss-feed 
Fix Atom feed for comments
 2014-08-29 17:48:37 +03:00
Dmitriy Zaporozhets 933d2dcc97 Merge pull request #7634 from zzet/patch-11 
Return extra empty line in blob render
 2014-08-29 17:43:51 +03:00
Dmitriy Zaporozhets 3daef3dd51 Merge pull request #7517 from jvanbaarsen/guard-spring-fix 
Updated the spring gem and fixed the guard file
 2014-08-29 17:39:18 +03:00
Dmitriy Zaporozhets dae9faf340 Merge pull request #7519 from jvanbaarsen/enable-blame-highlighting 
Enable highlighting for blame
 2014-08-29 17:38:50 +03:00