home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,392 Commits 48 Branches 340 Tags
638f8541dcd4a718e0c8187bb1dd4dfddffeb57d
Commit Graph
8392 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 638f8541dc Hide labels filter for MRs and remove unnecessary padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 20:36:03 +02:00
Dmitriy Zaporozhets 25741c97a2 Merge pull request #6350 from tudorpavel/filter-by-multiple-labels 
Add feature to filter issues by multiple labels
 2014-02-18 20:32:04 +02:00
Dmitriy Zaporozhets 1c61ac1c64 Refactor MR code reload 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 20:17:26 +02:00
Dmitriy Zaporozhets e1c93a6bca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-18 20:10:00 +02:00
Dmitriy Zaporozhets f0750b9166 Add close button to MR comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 20:09:31 +02:00
Dmitriy Zaporozhets 4eba8036ac Merge branch 'request/branch_compare' into 'master' 
Fix for compare button within branches dialog

For the button Compare within the Branches screen ( https://gitlab.com/gitlab-org/gitlab-ce/branches ) beside a branch "foo"

Old behavior:
Will redirect to the compare page that is defaulted to comparison for branch "foo" <--> "foo"

New behavior:
Will redirect and trigger compare page of branch "default" <--> "foo"
Remove of button beside default branch
 2014-02-18 15:51:51 +00:00
Dmitriy Zaporozhets 555c25e601 Fix random failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 17:34:22 +02:00
Dmitriy Zaporozhets d169ae132b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-18 16:52:07 +02:00
Dmitriy Zaporozhets 99966b6069 Merge branch 'namespace-api-doc' into 'master' 
Namespace Api Doc
 2014-02-18 14:50:13 +00:00
Dmitriy Zaporozhets 0bf4e568ea Use same avatar size for all event rows 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 16:49:50 +02:00
dosire 0007db8352 Doesn't exist for user endpoint. 2014-02-18 15:38:07 +01:00
Dmitriy Zaporozhets ec8628fa95 Merge branch 'feature/mr_context' into 'master' 
Allow change assignee/milestone from MergeRequest show page
 2014-02-18 14:29:44 +00:00
Dmitriy Zaporozhets 702128892b Allow change assignee/milestone from MergeRequest show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 16:24:27 +02:00
Dmitriy Zaporozhets b05a67f4e3 Split merge request coffee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 16:22:57 +02:00
Dmitriy Zaporozhets 9d637d576c Fix tests 2014-02-18 14:21:13 +00:00
Dmitriy Zaporozhets 8686d09d3e Merge branch 'feature/api_fle_encoded' into 'master' 
Complete api files CRUD

Adds ability to read file from repository with content encoded with Base64.
 2014-02-18 14:15:40 +00:00
Tudor Pavel 4f6b570fbe Filter issues by multiple labels with Spinach feature spec 2014-02-18 15:38:33 +02:00
Dmitriy Zaporozhets 8a55636f89 Dont replace all issue context when change assignee/milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 13:15:43 +02:00
Dmitriy Zaporozhets 26ebfa20f0 Merge branch 'bug/blob_escaped_json' into 'master' 
Fixed bug with json files content being escaped in api

Fixes #1035
 2014-02-18 10:46:50 +00:00
Dmitriy Zaporozhets 6cf39fe10d Extract commits API to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:41:21 +02:00
Dmitriy Zaporozhets ddbe978041 Complete api files CRUD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:27:02 +02:00
Dmitriy Zaporozhets 3c742dad27 Fixed bug with json files content being escaped in api 
After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 11:40:45 +02:00
Dmitriy Zaporozhets 87a449f264 Merge pull request #6321 from robertd/update_upgrader_guide 
Update upgrader.md ... safety first
 2014-02-18 11:29:49 +02:00
Dmitriy Zaporozhets 6f0126385d Merge pull request #6313 from jvanbaarsen/fix-6207-msi-mimetype 
Fixes #6207 Allow raw download of *.msi files
 2014-02-18 11:25:34 +02:00
Dmitriy Zaporozhets 767c39a325 Merge pull request #6339 from gdi2290/patch-1 
update copyright year to range
 2014-02-18 10:15:52 +02:00
Dmitriy Zaporozhets b939111a0c Merge pull request #6335 from jvanbaarsen/spring-binstubs 
Inserted spring in the binstubs
 2014-02-18 10:15:43 +02:00
Dmitriy Zaporozhets e62c87c446 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-18 09:58:12 +02:00
Dmitriy Zaporozhets 14fa0d5bd7 Merge pull request #6346 from jvanbaarsen/fix-5674-show-broadcast-everywhere 
Added broadcast message on every layout file
 2014-02-18 09:57:58 +02:00
Dmitriy Zaporozhets bf9372eaeb Merge branch 'password-reset-wording' into 'master' 
Password Reset Wording
 2014-02-18 07:15:46 +00:00
Dmitriy Zaporozhets 177b953d51 Merge branch 'improve/assignee_select' into 'master' 
Improve assignee select

Fixes #1036. Fixes #1047
 2014-02-18 07:15:36 +00:00
Dmitriy Zaporozhets ade780a9fe Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-18 09:04:59 +02:00
Dmitriy Zaporozhets e46883b015 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-18 09:04:51 +02:00
Dmitriy Zaporozhets 883c86a59e Fix notification specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 09:04:30 +02:00
Jeroen van Baarsen 4d093f9f8d Added broadcast message on every layout file 
Fixes: #5674
 2014-02-17 21:35:23 +01:00
Sytse Sijbrandij 96efdfade1 Merge pull request #6341 from Cynddl/feature/nofollow 
Fix issue with robots constantly asking for projects archives
 2014-02-17 19:11:32 +01:00
dosire e0022912d7 Better English for the password reset screen. 2014-02-17 17:30:50 +01:00
Dmitriy Zaporozhets 423dcb46ee Set initial value to Issue/MR form -> assignee selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-17 18:23:11 +02:00
Dmitriy Zaporozhets 0cc4a41d41 Merge branch 'link-to-new-installation-methods' into 'master' 
Link To New Installation Methods
 2014-02-17 16:10:37 +00:00
Dmitriy Zaporozhets 64dbcfe27f Revert css change done by mistake 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-17 18:09:49 +02:00
Dmitriy Zaporozhets 936353edfd Improve notification settings page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-17 18:06:24 +02:00
dosire c9b3767ff1 Double word. 2014-02-17 14:11:21 +01:00
dosire 97b47c735e Add new installation methods to the readme. 2014-02-17 12:29:56 +01:00
Cynddl 8dc3dafe24 Fix issue with robots constantly asking for projects archives 2014-02-17 11:26:33 +01:00
Dmitriy Zaporozhets 0744eac9c6 Merge pull request #6189 from jcockhren/api_ldap_check_for_user 
the existence of former ldap users doesn't imply LDAP is enabled.
 2014-02-17 09:26:10 +02:00
PatrickJS 10561f4c46 update copyright year to range 2014-02-16 23:06:35 -08:00
Dmitriy Zaporozhets 8136048875 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-16 19:51:39 +02:00
Dmitriy Zaporozhets e9cf2e140f Fix version sample for release candidate in monthly.md 2014-02-16 17:51:09 +00:00
Dmitriy Zaporozhets 4f4a1b961d Version to beta 2014-02-16 17:22:16 +00:00
Jeroen van Baarsen 99dc9c6fc9 Inserted spring in the binstubs 
Now possible to run:
`bin/rails`
`bin/rspec`
`bin/spinach`
`bin/rake`
 2014-02-16 11:22:03 +01:00
Dmitriy Zaporozhets 4bbb3d5510 Merge pull request #6333 from jvanbaarsen/added-spring 
Added spring to the project
 2014-02-16 11:24:26 +02:00