home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan Hu 774b7ee277 Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path 
Closes #1849
 2015-06-23 05:49:19 -07:00
Stan Hu 555fd0cf4a Fix downloading of patches on public merge requests when user logged out 
Closes #1225
Closes #1854
Closes #1858
 2015-06-23 05:34:21 -07:00
Douwe Maan 1cfdc7a63b Merge branch 'fix-issue-1771-2' into 'master' 
Fixed invalid timestamps in RSS feed #1771

Fixed invalid timestamps in RSS feed by using rfc3339 #1771

See merge request !870
 2015-06-23 11:59:03 +00:00
Valery Sizov f6286eb478 update changelog 2015-06-23 14:50:07 +03:00
Valery Sizov af93d447b6 Explicit error when commit not found in the GitLab CI 2015-06-23 14:50:06 +03:00
Stan Hu e80d7a804f Fix error when deleting a user who has projects 
Closes #1856
Closes https://github.com/gitlabhq/gitlabhq/issues/9394
 2015-06-23 04:39:49 -07:00
Dmitriy Zaporozhets 883438970d Merge branch 'rubocop-for-tests' into 'master' 
Enable rubocop for tests too

cc @DouweM @rspeicher

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !862
 2015-06-23 10:36:36 +00:00
Rowan Wookey cacc955acc Fixed invalid timestamps in RSS feed #1771 2015-06-23 11:32:26 +01:00
Dmitriy Zaporozhets 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +02:00
Dmitriy Zaporozhets a8e4e6aaba Merge branch 'identity-validation' into 'master' 
Validate presence of provider field in Identity

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !869
 2015-06-23 10:08:52 +00:00
Dmitriy Zaporozhets 4b31f4b683 Its 7.13 time :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 11:44:12 +02:00
Dmitriy Zaporozhets 21e227d870 Validate presence of provider field in Identity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 11:21:23 +02:00
Dmitriy Zaporozhets 7780a886e7 Set proper title when edit identity from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 10:56:12 +02:00
Dmitriy Zaporozhets 615257b91c Merge branch 'animation-sidebar' into 'master' 
Animation of Sidebar (video in here)

Edited the CSS of header and sidebar; added a new div of gitlab-logo-container to the html to make things easier.

The transition-duration is set to 0.3s and when the nav bar expands, it opens up over the text, essentially revealing hidden text.

[animation-sidebar-2.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b15996a256d6bed03a19c68549d116e4/animation-sidebar-2.mov)

/cc @JobV @nicolas2

See merge request !849
 2015-06-23 08:53:31 +00:00
Dmitriy Zaporozhets f189c36d8d Merge branch 'rs-dev-issue-2414' into 'master' 
Allow Admin to filter users by 2FA status

> ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png)

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414

See merge request !852
 2015-06-23 08:48:22 +00:00
Dmitriy Zaporozhets 779646ef38 Fix rubocop issues after merge of recent master 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 10:46:29 +02:00
Dmitriy Zaporozhets f40b99d02e Merge branch 'master' into rubocop-for-tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/features/issues_spec.rb
	spec/models/forked_project_link_spec.rb
	spec/models/hooks/service_hook_spec.rb
	spec/models/hooks/web_hook_spec.rb
	spec/models/project_services/hipchat_service_spec.rb
	spec/requests/api/project_members_spec.rb
	spec/requests/api/projects_spec.rb
	spec/requests/api/system_hooks_spec.rb
	spec/services/archive_repository_service_spec.rb
	spec/support/matchers.rb
	spec/tasks/gitlab/backup_rake_spec.rb
 2015-06-23 10:44:03 +02:00
Dmitriy Zaporozhets 4aa1fdd347 Merge branch 'fix-project-icon-links' into 'master' 
Fix avatar tests to use banana_sample.gif

Fixes tests that were broken in f5e0e5c0 due to the purge of `gitlab_logo.png`.

See merge request !866
 2015-06-23 08:32:21 +00:00
Dmitriy Zaporozhets 1beb0dbe56 Fix admin identities code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 10:26:50 +02:00
Stan Hu 9369adb93d Fix Style/NonNilCheck cop violations 2015-06-22 22:26:41 -07:00
Stan Hu 52aa21b12d Fix Style/IndentationWidth cop violations 2015-06-22 22:25:40 -07:00
Stan Hu 3446bea719 Fix Style/CaseIndentation cop violations 2015-06-22 22:25:21 -07:00
Stan Hu 359ed48638 Fix Style/AlignHash cop violations 2015-06-22 22:24:39 -07:00
Robert Speicher dcfce8b198 Use alias_attribute to define User#two_factor_enabled 2015-06-22 21:14:07 -04:00
Robert Speicher 871bb2f143 Fix bad multi-line split from previous commit 2015-06-22 16:06:04 -04:00
Robert Speicher 15a05be70d Fix Style/Blocks cop violations 2015-06-22 16:00:54 -04:00
Stan Hu fe94254571 Fix avatar tests to use banana_sample.gif since SVG is not supported 2015-06-22 12:04:07 -07:00
Darby 95e2ca7630 fixed the resizing icon issue 2015-06-22 12:03:16 -07:00
Robert Speicher 8832839291 Fix Style/CommentIndentation cop violation 2015-06-22 14:56:48 -04:00
Robert Speicher 0bb320cfda Fix Style/HashSyntax violations 2015-06-22 14:54:33 -04:00
Robert Speicher 4dbf118a16 Fix Style/Not cop violations 2015-06-22 14:52:41 -04:00
Robert Speicher 0716a559b5 Fix Style/AsciiComments cop violation 2015-06-22 14:43:51 -04:00
Robert Speicher 94eff65569 Fix Style/SpaceInsideHashLiteralBraces cop violations 
These fixes were performed automatically by Rubocop's `-a` flag.
 2015-06-22 14:41:00 -04:00
Robert Speicher 56246b70fb Fix Style/TrailingBlankLines cop violations 2015-06-22 14:38:33 -04:00
Robert Speicher 649c9969ba Fix Style/IndentationConsistency cop violations 2015-06-22 14:33:01 -04:00
Dmitriy Zaporozhets 7390b94db2 Fix code style issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 18:02:50 +02:00
Dmitriy Zaporozhets d7553d3630 Address review comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 18:01:52 +02:00
karen Carias 707864a4f3 added images to doc 2015-06-22 09:00:38 -07:00
Dmitriy Zaporozhets 73e003013f Merge branch 'master' into admin-edit-identities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/admin/users/show.html.haml
 2015-06-22 18:00:11 +02:00
karen Carias 1b82bd27ea added new file about creating your SSH keys 2015-06-22 08:54:40 -07:00
Dmitriy Zaporozhets 3fe3cbf222 Fix indendity test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:52:22 +02:00
Robert Speicher aedb546964 Correct AddDefaultOtpRequiredForLoginValue migration 
Also MySQL complains when you change a field to be not null if any
existing records already have a null value, so this updates those rows.
 2015-06-22 11:36:11 -04:00
Dmitriy Zaporozhets cc04c5b828 Refactor admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:12:20 +02:00
Dmitriy Zaporozhets b21390936a Make provider a select for identities form in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 16:53:11 +02:00
Dmitriy Zaporozhets 8f89a48847 Minor improvements to admin identities text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 16:52:06 +02:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
 2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets bcb07929fe Merge branch 'nginx_defaulthost_documentation' into 'master' 
Close #178 Nginx conf default_host documentation

This closes #178
We're just making it clear that some nginx installs such as by default on recent Ubuntu's, the /etc/nginx/sites-enabled/default file will conflict the listen line of the gitlab nginx conf's due to the default_server directive.

changed installation.md to identify the issue to a user
added notes to both nginx configs for gitlab and gitlab-ssl
[ci-skip

See merge request !225
 2015-06-22 13:22:58 +00:00
Dmitriy Zaporozhets 7bee9ce10e Merge branch 'see-full-size-avatar' into 'master' 
Link an users avatar to the fullsize version

When we want to see the fullsize avatar of a user we can click the avatar on the profile page and the fullsize version will be opened in a new window/tab.

See merge request !415
 2015-06-22 13:21:17 +00:00
Dmitriy Zaporozhets d3978e0b27 Merge branch 'remove_unused_except' into 'master' 
projects doesn't seem to be a valid action in this controller

Hi,

This is just a tiny change. Let me know if I'm doing it wrong...

Eaden

See merge request !696
 2015-06-22 13:20:14 +00:00
Dmitriy Zaporozhets 595b3323a8 Merge branch 'rs-rspec3' into 'master' 
RSpec3

Upgrades rspec to 3.3.0, we're now up-to-date! 🎉

See merge request !831
 2015-06-22 13:15:27 +00:00