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
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
66 Commits
Author SHA1 Message Date
Rubén Dávila 1278a1fb29 Discourage users from clicking 'Clear LDAP permission cache'. #280 2015-11-24 10:48:05 -05:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
Han Loong Liauw 95411f7151 fixed positioning of hamburger menu on header 
- Changed to margin for vertical allign as used in bootstrap 3 original
 - Also added an `active` state to show when the extra items are enabled
 2015-10-09 14:05:55 +11:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Stan Hu 1fdf56c95d Prevent anchors from being hidden by header upon a new page load. 
Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:

http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict

Add a little more of an offset to see a few lines before the anchor.

Closes #1614
Closes #1024
 2015-08-29 02:05:37 -07:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00
Dmitriy Zaporozhets e02b7bf443 Improve abuse reports management 
* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report with page reloading

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 10:52:10 +02:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Robert Speicher cad0e848b0 Fix and style the "Changes suppressed" link. 2015-07-23 16:07:45 -04:00
Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +02:00
Dmitriy Zaporozhets 98cb6256fa Add nice scroll for sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-14 12:29:57 +02:00
Dmitriy Zaporozhets 919e702c86 Revert "Diff headers made sticky" 
This reverts commit af44c65030.
 2015-07-06 11:30:30 +02:00
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
Robert Speicher 2efb0b6e93 Remove duplicate timeago call 2015-06-17 16:37:10 -04:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Robert Speicher 29626b0885 Remove unused showAndHide, simpleFormat, and linkify functions 
Also removes redundant `unbind` call
 2015-06-02 20:32:07 -04:00
Robert Speicher 4560954404 Move jQuery enable/disable extensions to extensions/jquery 
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
 2015-06-02 20:32:07 -04:00
Dmitriy Zaporozhets 01f6ae2351 improve navbar collapse for mobile views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:55:20 +02:00
Stan Hu 310e08dc2c Fix clone URL losing selection after a single click in Safari and Chrome 
Closes #9326
 2015-05-24 20:19:26 -04:00
Robert Speicher bd85e8ea5a Fix default tooltip placement 2015-05-17 18:13:27 -04:00
Douwe Maan d1f2b09fad Allow license to be uploaded and enforce its validity. 2015-05-01 14:52:30 +02:00
Robert Speicher 1e1785cc16 Place the logo's tooltip dynamically 
When collapsed it's on the right like everything else, when expanded
it's on the bottom.
 2015-04-25 16:03:18 -04:00
Robert Speicher d30ceda7de Add collapsed navbar links to the default tooltip selector 2015-04-25 16:00:30 -04:00
Robert Speicher e8faf9178a Remove the has_bottom_tooltip class 
Bootstrap's tooltip JS can read the placement from a `data-placement`
attribute.

Further, when we supply the `selector` option to `tooltip`, tooltips
will be added to any dynamically-added elements matching the selector,
without us having to re-call the `tooltip` method.
 2015-04-25 14:03:40 -04:00
Dmitriy Zaporozhets a22f3139f3 Merge branch 'rs-reply-hotkey' into 'master' 
"Reply quoting selected text" shortcut/hotkey

Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms.

This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs.

See merge request !1775
 2015-04-22 19:57:40 +00:00
Stan Hu 6fb1e80a26 Fix "Cannot move project" error message from popping up after a successful project transfer 
Multiple event handlers were firing, causing multiple form submissions.

Closes #1448 and #1128
 2015-04-20 12:46:02 -07:00
Robert Speicher 4d1878253e Typo: Issueable -> Issuable 2015-04-18 15:20:15 -04:00
Dmitry Medvinsky 92544df8da Fix auto-selection of URL field with X11 selection 
We use `focusin` event instead of `click` because when using the latter,
when the selection is created it isn't put into X11 PRIMARY selection.
And as a Linux user I'm very used to such behaviour that when something
gets selected, it's ready for pasting, which is the primary purpose of
the clone URL field.

When `focusin` is used, the selection is copied to X11 buffer
automatically, so it works as expected (tested in Firefox and Chrome).
 2015-04-17 10:16:18 +03:00
Dmitriy Zaporozhets e0f8e022f7 Improve comment toggle button in diff 2015-03-18 17:53:43 -07:00
Dmitriy Zaporozhets 93447c4b14 Merge pull request #8760 from yglukhov/diff-sticky-headers 
Diff headers made sticky
 2015-02-23 23:50:07 -08:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00
yglukhov af44c65030 Diff headers made sticky 2015-02-09 15:34:06 +02:00
Douwe Maan 463d9f76e4 Autosave and autorestore unsaved comments. 
Closes #1738.
 2015-02-07 20:55:17 +01:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Dmitriy Zaporozhets 7f1633e294 Merge pull request #7615 from yglukhov/new-branch-submit-button-validation 
Validation of 'Create branch' and 'Create tag' buttons
 2015-01-21 23:05:02 -08:00
Dmitriy Zaporozhets 892be53fa3 Merge pull request #8425 from rumpelsepp/rouge 
Replace highlight.js with rouge-fork rugments
 2015-01-15 14:28:24 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments 
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
 2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets 8bc65f6d4b Fix anchors being hidden under fixed navbar issue 2015-01-14 19:39:10 -08:00
uranandyglukhov b34e83d261 Corrected validation of 'Create branch' and 'Create tag' buttons 2014-12-23 16:04:39 +02:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03: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 2a16bbd626 Merge pull request #7572 from mr-vinn/application-js-fix 
Handle undefined text area values
 2014-10-28 15:23:45 +02: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
Patricio Cano 3d705131f7 Added a password strength indicator 
to the profile page and the sign_up page, added CSS to best display it and created the custom script to load the meter.
 2014-10-13 22:05:21 -05:00
Dmitriy Zaporozhets 74217f753f Apply ConfirmDangerModal for project transfer/remove actions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-08 13:57:54 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Dmitriy Zaporozhets 6d0ddf45ba Raw implementation of commits stats page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-26 20:32:44 +03:00
MarkPochert 1be7c25dce Update application.js.coffee 
The require jquery.turbolinks should be before the require turbolinks.

https://github.com/rails/turbolinks => "Add the gem to your project, then add the following line to your JavaScript manifest file, after jquery.js but before turbolinks.js"
 2014-09-26 10:17:26 +02:00
Dmitriy Zaporozhets 20d6f96928 Improve flash messages 
* dont fadeout so user can read
* show inside content block so user can notice it

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-25 18:00:21 +03:00