home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +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
Dmitriy Zaporozhets d5d1802096 Set right test as tricky 2015-01-29 23:48:00 -08:00
Dmitriy Zaporozhets b21565f18d Fix semaphore spinach tags 2015-01-29 23:28:38 -08:00
Dmitriy Zaporozhets 23c31a0b12 Skip tricky test for semaphore 2015-01-29 23:06:43 -08:00
Dmitriy Zaporozhets b7cf72f6ea Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-29 22:43:13 -08:00
Dmitriy Zaporozhets c4c808992b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-29 22:42:56 -08:00
Dmitriy Zaporozhets 71ebf3aa1c Merge pull request #8670 from tsigo/rs-fa-icon-helper 
Add icon helper method
 2015-01-29 22:42:37 -08:00
Dmitriy Zaporozhets fd713572f6 Merge pull request #8687 from tsigo/rs-pry-rails 
Use pry-rails gem instead of pry
 2015-01-29 22:40:55 -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 95ec0442bb Merge branch 'improve-calendar-widget' into 'master' 
Improve calendar widget

See merge request !1453
 2015-01-30 06:36:05 +00:00
Dmitriy Zaporozhets 7a5784ec41 Update changelog with version 7.7.2 2015-01-29 22:03:34 -08:00
Dmitriy Zaporozhets 98116b768c Merge pull request #8642 from fchasen/master 
Expose Link header in CORS Api calls
 2015-01-29 18:46:27 -08:00
Dmitriy Zaporozhets 78d7c5087b Use tile avatars for user/group show pages 2015-01-29 17:30:51 -08:00
Dmitriy Zaporozhets 31245a40c1 Remove : from headers 2015-01-29 17:13:28 -08:00
Dmitriy Zaporozhets f1cf49218f Improve contribution calendar on user page 
* cache user contributions for day
* ignore forks in calendar contribtuions
 2015-01-29 17:07:44 -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
Dmitriy Zaporozhets 5ec36902dd Fix calendar js 2015-01-29 16:00:46 -08:00
Dmitriy Zaporozhets 65a4e64b3a Bump gitlab-shell version 2015-01-29 15:38:22 -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 604f39274d Merge branch 'ldap-email-match' into 'master' 
Improvements to LDAP::User model

* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one

Fixes #1946

See merge request !1452
 2015-01-29 22:22:43 +00: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 ff56b2d9ed Use pry-rails gem instead of pry 
pry-rails has pry as a dependency and this lets us have all that pry
when we run `rails console` ❤️
 2015-01-29 13:13:12 -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 d54f809804 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-29 09:43:09 -08:00
Dmitriy Zaporozhets 152a6b863d Merge branch 'calendar-via-ajax' into 'master' 
User contribution calendar via ajax

See merge request !1451
 2015-01-29 17:42:14 +00:00
Robert Schilling b5b9b67ea5 Merge branch 'master' into 'master' 
Bump GitLab for Docker to version 7.7.1

See merge request !321
 2015-01-29 17:41:48 +00:00
Dmitriy Zaporozhets 08582f1532 Improve user calendar authentification and tests 2015-01-29 08:55:57 -08:00
Vincent Robert 35bf471a13 Bump Gitlab for Docker to 7.7.1 2015-01-29 16:34:01 +01:00
Achilleas Pipinellis 4ce18089f6 Remove text about hidden settings. 2015-01-29 17:13:38 +02:00
Dmitriy Zaporozhets 1f0e16569f Load contribution calendar via AJAX 2015-01-29 01:20:17 -08:00
Dmitriy Zaporozhets c9f18d4587 Make sure we dont have exception on date parsing 2015-01-29 01:03:20 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets 6e1f9e746c Merge branch 'gitlab_importer' into 'master' 
Ability to clone project using oauth2 token

See merge request !1447
 2015-01-29 07:03:30 +00:00
Dmitriy Zaporozhets beb7a42548 Merge branch 'ux-fixes' into 'master' 
UX improvements (Implement lessons from user testing)

* add link to permissions help page from new project/group member form
* Improve UX for widget if merge request can not be merged
* Improve wording for fork project page

See merge request !1448
 2015-01-29 07:01:58 +00:00
Dmitriy Zaporozhets de2098f4e7 Merge branch 'haynes/gitlab-ce-commit_calendar' 2015-01-28 23:00:49 -08:00
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -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
Dmitriy Zaporozhets 2149f8b52c Merge branch 'css-refactoring' into 'master' 
Small css improvements

See merge request !1450
 2015-01-29 06:43:26 +00:00
Dmitriy Zaporozhets 953c1fff8f Be more careful with parsing changes from gitlab-shell 2015-01-28 17:00:40 -08:00
Dmitriy Zaporozhets ef315dda5f Add light border to bootstrap panels 2015-01-28 16:59:25 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Valery Sizov d74e732299 update changelog 2015-01-28 15:58:25 -08:00
Valery Sizov 54f6d8c7b5 an ability to clone project with oauth2 token 2015-01-28 15:57:31 -08:00
Dmitriy Zaporozhets f2f7b5a18e Better wording 2015-01-28 15:37:20 -08:00
Dmitriy Zaporozhets b076d8cddb Fix test for merge request 2015-01-28 15:36:12 -08:00
Dmitriy Zaporozhets 1718075a02 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-28 15:15:28 -08:00
Dmitriy Zaporozhets 8e1f032e04 Merge branch 'create_gitlab_internal_issue_service' into 'master' 
Create gitlab internal issue service

Part of #1908

Create a default gitlab issue tracker service which will replace having issue tracker fields for project.

See merge request !1449
 2015-01-28 23:15:13 +00:00
Dmitriy Zaporozhets 76f7553863 Merge pull request #8663 from yglukhov/semantic-ui-sass-update 
Update semantic-ui-sass to 1.8
 2015-01-28 14:49:35 -08:00
Marin Jankovski 68f7302474 Add a scope for visible services, code styling changes for easier readability. 2015-01-28 14:25:55 -08:00