home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,145 Commits 48 Branches 340 Tags
ce6b0519ccddff2476d2255df49b39ccdb07013e
Commit Graph
709 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets f9ece12e87 Merge branch 'master' into oauth2_provider 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/nav/_profile.html.haml
 2014-12-25 18:48:15 +02:00
Dmitriy Zaporozhets aadfb3665f Fix tests and add message if no oauth apps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 18:46:19 +02:00
Dmitriy Zaporozhets fca161f5c5 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-25 15:55:12 +02:00
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets 5cf2bd4c99 Merge branch 'project-path' into 'master' 
Project path

Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763

See merge request !1337
 2014-12-24 13:27:26 +00:00
Dmitriy Zaporozhets 35eec009e5 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 14:34:37 +02:00
Dmitriy Zaporozhets 97d7c06f78 Fix scroll problems and disable authorized_only filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 12:56:03 +02:00
Dmitriy Zaporozhets 7b792af872 Improvements to issues/mr filters: 
* use filter_params variable when set filter values
* fix project issues spinach tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:39:03 +02:00
Dmitriy Zaporozhets 3eb586c12c Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 17:18:53 +02:00
Dmitriy Zaporozhets d0b1bc222e Fix spinach test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 16:48:40 +02:00
Dmitriy Zaporozhets 5b49bb208a Fix issueable context update and fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 16:42:26 +02:00
Dmitriy Zaporozhets 1f2628fe21 Allow Group path to be changed at the same time as name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 15:02:47 +02:00
Dmitriy Zaporozhets e45e6ba2c3 Merge branch 'master' into sidebar-nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/layouts/group.html.haml
 2014-12-21 01:20:51 +02:00
Dmitriy Zaporozhets bcc04adb13 Css/views cleanup after layout restyle 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-21 01:11:08 +02:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Dmitriy Zaporozhets 4cbe72d767 UI improvements mostly for mobile screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 11:31:57 +02:00
Dmitriy Zaporozhets d7568727b9 Merge pull request #8283 from cardoe/hipchat-private-server 
HipChat custom server support
 2014-12-01 18:25:28 +02:00
Dmitriy Zaporozhets 5c1496a4d8 Improve project factories 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-30 10:50:15 +02:00
Daniel AquinoandDoug Goldstein 1353f9aa64 HipChat service: support custom servers 
HipChat allows users to run their own private servers and to be able to
support those we must connect to the correct URL when using one of these
custom servers.
 2014-11-19 21:27:24 -06:00
Doug Goldstein 2f3df4cb56 HipChat service: correct service name & use v2 API 
HipChat refers to their own product camel cased so we should do the
same. HipChat no longer recommends people use the deprecated v1 API so
switch to using the v2 API by default. hipchat-rb does not yet default
to v2 in any version so it must be specified.
 2014-11-19 21:26:58 -06:00
Dmitriy Zaporozhets f7bf892cca Revert "gitlab shell works if multiple rubies installed" 
This reverts commit 533f4cdf30.
 2014-11-18 17:14:36 +02:00
Dmitriy Zaporozhets cfee95d032 Merge pull request #8340 from cirosantilli/multi-ruby-install-v2 
Web edit and HTTPS push work if multiple Rubies installed v2
 2014-11-18 15:00:56 +02:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Dmitriy Zaporozhets 2388fdd7c6 Improve fork to namespaces feature 
* Show namespace thumbnail differently if project was already forked
* Show loading spinner when click on fork
* Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 16:06:39 +02:00
Valeriy Sizov b0b234f739 Merge pull request #8234 from cirosantilli/factor-0000 
Factor '0' * 40 blank ref constants [failure unrelated]
 2014-11-05 16:20:56 +02:00
Valeriy Sizov f84772875e Merge pull request #7863 from cirosantilli/rm-blob-link-to-button 
Transform remove blob link into button.
 2014-11-05 14:09:32 +02:00
Ciro Santilli c3be1517ae Factor '0' * 40 blank ref constants 2014-11-03 20:37:08 +01:00
Marin Jankovski fe610ff576 Merge pull request #8156 from stevenosloan/update_slack_and_use_raw_webhook_url 
update slack-notifier for new webhook_url format
 2014-11-03 09:57:05 +01:00
Dmitriy Zaporozhets e1299bab7b Merge branch 'feature_password_strength_indicator' into 'master' 
Add a password strength indicator to SIGN UP and PROFILE pages

Fixes #1647

Added a password strength indicator to the sign up page. You can see how it looks in the following screenshot. In the sign up page, it checks if the password contains the username and alerts the user about it. If the user still wants to proceed with creating his account, nothing will stop him. This is merely a message. The indicator changes the input background color based on the strength like this:

![new_full](https://dev.gitlab.org/uploads/gitlab/gitlabhq/0e6da27cfe/new_full.png)

The password strength indicator can also be found in the profile edit page. It functions in almost the exact same way, with the exception that it doesn't check if the password contains the username.

![edit_full](https://dev.gitlab.org/uploads/gitlab/gitlabhq/f73001539e/edit_full.png)

There are tests included.

/cc @job

See merge request !1227
 2014-10-30 11:32:11 +00:00
Dmitriy Zaporozhets ff6b352610 Merge branch 'project_name_and_path_rename' into 'master' 
Project name and path rename in the same section

Fixes #1577

See merge request !1223
 2014-10-30 11:19:33 +00:00
Dmitriy Zaporozhets 93bed4435e Merge pull request #8060 from dblessing/feature/bamboo_service 
Add Atlassian Bamboo service
 2014-10-29 13:41:13 +02:00
Dmitriy Zaporozhets 9306d8fca2 Merge branch 'dashboard_issues_and_mr' into 'master' 
Dashboard issues and merge request filters

Fixes #1597

See merge request !1219
 2014-10-28 13:38:41 +00:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Marin Jankovski 50ee0b81b8 Leave the project name field editable, fix the test. 2014-10-28 09:19:58 +01:00
Valery Sizov 40c8f159a2 Fix raw view for public snippets 2014-10-27 11:51:31 +02:00
Marin Jankovski 5e017a4566 Assigned merge request should show on dashboard mr overiew feature spec. 2014-10-27 09:53:35 +01:00
Marin Jankovski 93532432dc Failing feature for dashboard merge requests when user has authored issues on forked project source. 2014-10-27 09:30:39 +01:00
Marin Jankovski d747612385 Failing feature for dashboard issues when user has authored issues on projects he is not a member of. 2014-10-27 09:20:43 +01:00
Patricio Cano 000af8d5d7 Moved require from application.js to password_strength.js 
Corrected div id for profile password/edit
Added first spinach tests
 2014-10-24 17:19:35 -05:00
Ciro Santilli e4912243c1 Transform remove blob link into button. 2014-10-24 23:44:30 +02:00
Valery Sizov 705652d625 fix for public snippet 2014-10-24 11:52:52 +03:00
Patricio Cano 7fbc4f5b3a Corrected the layout of the strength indicator to be more consistent throughout the application. 
Fixed a test that was looking for an outdated HTML ID
 2014-10-23 17:49:48 -05:00
Steven Sloan 7b339e61e8 update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation 
per changes with slack, they’re now using “static” web hook urls that describe the team & service with IDs that don’t change if the team or service name change. their recommendation is to use the raw webhook_url instead of building it out of components to allow more flexibility

this should also prevent issues cropping up with mistakes in how the urls are parsed
 2014-10-23 14:47:28 -04:00
Patricio Cano 7039c9868a Updated the IDs of the fields, so that it wouldn't mess with many tests 
Updated some tests to match new IDs
 2014-10-22 20:39:02 -05:00
Vinnie Okada 7a5072c5a8 Fix test assertions 
Make sure we're asserting the correct thing when testing visible and
invisible DOM elements.
 2014-10-21 23:29:31 -05:00
Dmitriy Zaporozhets 72abe9f679 Merge branch 'fix-group-member-remove' into 'master' 
Fix group member remove

Fixes https://github.com/gitlabhq/gitlabhq/issues/8090.

See merge request !1196
 2014-10-20 12:44:07 +00:00
Dmitriy Zaporozhets 2064a14724 Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 13:18:07 +03:00
Vinnie Okada 5bb8aff5dd Fix more Markdown preview tests 2014-10-18 18:43:45 -05:00
Vinnie Okada 74c82ae325 Fix houndci warnings 2014-10-18 18:24:12 -05:00