home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,945 Commits 48 Branches 340 Tags
04b09bdd6793df01ef488a8480be8fce48cb3f09
Commit Graph
1884 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dd8dd92e50 Merge branch 'api-default-order' into 'master' 
Sorting refactoring

* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope

See merge request !1476
 2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets 6b61c90498 Merge branch 'markdown-preview-via-post' into 'master' 
Don't have Markdown preview fail for long comments/wiki pages.

See https://github.com/gitlabhq/gitlabhq/issues/8611.

See merge request !1479
 2015-02-06 17:55:30 +00:00
Douwe Maan 639c93b4f2 Don't have Markdown preview fail for long content by using POST rather than GET. 
See https://github.com/gitlabhq/gitlabhq/issues/8611.
 2015-02-06 11:23:12 +01:00
Dmitriy Zaporozhets f9e6f66898 Fix tests 2015-02-05 22:40:35 -08:00
Dmitriy Zaporozhets bdfb349ff7 Refactor and improve sorting objects in API for projects, issues and merge requests 2015-02-05 22:00:54 -08:00
Valery Sizov b3c90dd514 GitHub importer refactoring 2015-02-05 21:48:21 -08:00
Dmitriy Zaporozhets c5be267e40 Refactor issuable sorting a bit 2015-02-05 20:21:21 -08:00
Valery Sizov 2d5765bd2c gitlab.com importer: fix specs after refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 33349dd549 GitLab.com integration: refactoring 2015-02-05 12:50:34 -08:00
Valery Sizov 7ddba92a39 Gitlab integration: added tests 2015-02-05 12:50:34 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets 50e8e5943f Merge branch 'redirect-sign_up' into 'master' 
Redirect signup page to signin page.

Resolves #1916.

See merge request !1468
 2015-02-05 16:47:11 +00:00
Douwe Maan ab22caa97e Redirect signup page to signin page. 
Resolves #1916.
 2015-02-05 15:56:28 +01:00
Dmitriy Zaporozhets fc13ea7137 Merge pull request #8712 from jvanbaarsen/add-merge-request-files-endpoint 
Added a way to retrieve MR files
 2015-02-04 14:46:54 -08:00
Dmitriy Zaporozhets 61d07eabfc Fix tests 2015-02-04 13:54:19 -08:00
Jeroen van Baarsen b60d06eb2c Added a way to retrieve MR files 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-04 10:24:25 +01:00
Dmitriy Zaporozhets 635ebac606 Merge branch 'master' into mwessel/gitlab-ce-configure-protection 2015-02-03 17:54:33 -08:00
Dmitriy Zaporozhets ded30e3efe Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav 2015-02-03 12:05:11 -08:00
Dmitriy Zaporozhets 8618277f24 Merge branch 'issue-merge-req-context-links' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-issue-merge-req-context-links 
Conflicts:
	CHANGELOG
 2015-02-03 11:22:16 -08:00
Dmitriy Zaporozhets dc9bf32420 Merge pull request #8723 from jubianchi/api-groups-path 
Access groups using path
 2015-02-03 10:57:27 -08:00
Valery Sizov b9d9ac82a9 Commit page: async load branches info 
Conflicts:
	config/routes.rb
 2015-02-03 09:10:56 -08:00
Jason Blanchard ee955d7a12 Adds persistent collapse button for left side bar 2015-02-03 11:45:33 -05:00
Jason Blanchard 97d4ac4047 Adds link to milestone and keeping resource context on smaller 
viewports for issues and merge requests
 2015-02-03 11:41:32 -05:00
jubianchi 4e97f26649 Acces groups with their path in API 2015-02-03 13:42:38 +01:00
Dmitriy Zaporozhets c0acb28c4e Annotate models 2015-02-02 10:24:40 -08:00
Marco Wessel ac7af45d89 Add test for default branch protection configuration 2015-01-31 09:10:26 +01:00
Robert Speicher ab6f7164e0 Make the structure of spec/models match app/models 2015-01-30 15:51:10 -05:00
Dmitriy Zaporozhets c47328948b Fix specs for icons 2015-01-30 00:22:51 -08:00
Dmitriy Zaporozhets cb1c815dca Merge pull request #8688 from tsigo/rs-clean-spec-output 
Minor spec output cleanup
 2015-01-29 22:40:33 -08:00
Dmitriy Zaporozhets a3c2873f50 Merge pull request #8676 from tsigo/rs-repository-cache 
Refactor Repository to use new RepositoryCache class
 2015-01-29 16:45:39 -08:00
Marco Wessel 20e269cb92 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection 
Conflicts:
	CHANGELOG
	db/schema.rb
 2015-01-30 00:16:24 +01:00
Dmitriy Zaporozhets ca701a9649 Improvements to LDAP::User model 
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
 2015-01-29 13:28:41 -08:00
Robert Speicher ed17adfbcd Update shoulda-matchers 
This outdated gem was the cause of those annoying MiniTest errors.

Also updates one use of `ensure_inclusion_of` which was deprecated in
favor of `validate_inclusion_of`.
 2015-01-29 13:14:30 -05:00
Robert Speicher 9de4e696a6 Remove errant print statements from votes spec 
This caused those random "true" outputs in the rspec output.
 2015-01-29 13:14:30 -05:00
Robert Speicher 4eafc18843 Refactor Repository to use new RepositoryCache class 
Abstracts away the lower-level implementation details from the
Repository model.
 2015-01-29 13:03:47 -05:00
Dmitriy Zaporozhets 08582f1532 Improve user calendar authentification and tests 2015-01-29 08:55:57 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets 815e9aa283 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar 2015-01-28 22:52:44 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Marin Jankovski c6c7552e41 Build the urls inside of the service. 2015-01-28 13:19:32 -08:00
Dmitriy Zaporozhets 8cc111bd03 Fix random failing test 2015-01-27 13:40:23 -08:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' 
Move external issue tracker away from yml config

See merge request !1442
 2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets 7155507af5 Merge pull request #8609 from jubianchi/issues/6289-api-handle-error-project-repo 
Handle errors on API when a project does not have a repository
 2015-01-27 12:51:18 -08:00
Dmitriy Zaporozhets 5e20cb82d7 Merge pull request #8652 from bladealslayer/feature/system_hook_for_groups 
Added support for firing system hooks on group create/destroy and adding...
 2015-01-27 12:49:24 -08:00
Boyan Tabakov 93bc2d5202 Added support for firing system hooks on group create/destroy and adding/removing users to group. 
Added tests and updated docs. Also adding 'user_id' field in the hooks for adding/removing user from team.
 2015-01-27 09:25:28 +02:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Marin Jankovski 33913f9b8f Make issue tracker service fields required. 2015-01-26 22:08:27 -08:00
Dmitriy Zaporozhets ed8c3e2d73 Remove unnecessary reload in test 2015-01-26 16:10:34 -08:00
Dmitriy Zaporozhets 90ba3a385c Fix tests for blobs refactoring 2015-01-26 16:08:59 -08:00
Marin Jankovski 9b5b334a79 Remove unused feature steps. 2015-01-26 16:04:08 -08:00