Commit Graph
8955 Commits
Author SHA1 Message Date
Ciro Santilli 2d187976be Run user select Js only where needed
Transform current implementation into regular Coffescript classes
so that the same call method can be reused on the dispatcher
as for other classes.
2014-10-27 18:28:36 +01:00
Dmitriy Zaporozhets 367d4db4cd Merge pull request #8155 from cirosantilli/unassigned
Show nothing instead of unassigned on issues
2014-10-27 19:21:26 +02:00
Dmitriy Zaporozhets 32a7d49a36 Merge pull request #8125 from cirosantilli/namespace-select-js-only-needed
Only run namespace select js when needed
2014-10-27 19:19:35 +02:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config
Use Gitlab.config instead of Settings everywhere
2014-10-27 19:18:48 +02:00
Dmitriy Zaporozhets 243a74e995 Merge pull request #8123 from cirosantilli/project-js-only-needed
Better js -> URL projects map to reduce unneeded execution
2014-10-27 19:18:27 +02:00
Ciro Santilli 951abce562 Factor behaviors.scss constants 2014-10-27 18:13:01 +01:00
Marin Jankovski d08bb4b3a4 Add project name to rename repository section 2014-10-27 16:08:11 +01:00
Dmitriy Zaporozhets 94d8698a85 Merge branch 'fix_raw_view_snippets' into 'master'
Fix raw view snippets

See merge request !1220
2014-10-27 13:56:57 +00:00
Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable
Conflicts:
	CHANGELOG
	VERSION
2014-10-27 12:08:44 +02:00
Valery Sizov 40c8f159a2 Fix raw view for public snippets 2014-10-27 11:51:31 +02:00
Marin Jankovski d3bdd3ba67 Do not filter out issues and merge requests related to user right away. 2014-10-27 10:02:20 +01:00
Patricio Cano 37f33393b2 Changed colors to match GitLab's red & green and softened the yellow. 2014-10-24 19:17:00 -05: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 7f97a1277d internal snippets: fix exposing of title 2014-10-24 19:39:14 +03:00
Valery Sizov 5f7906e163 fix for public snippet 2014-10-24 12:52:59 +03:00
Marin Jankovski 8a7b864e41 Merge branch 'fix_public_snippets' into 'master'
Fix public snippets

See merge request !1214
2014-10-24 09:39:22 +00: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
Ciro Santilli 2c14f9c41f Show nothing instead of unassigned on issues 2014-10-23 16:25:09 +02:00
Robert Schilling e80ef19b31 Merge pull request #8114 from cirosantilli/rm-global-avatar-js
Only run avatar chooser Js on pages that need it
2014-10-23 12:07:45 +02:00
Robert Schilling e6e5e63c29 Merge pull request #8118 from cirosantilli/user-groups-space-link
Remove whitespace link between user group avatars
2014-10-23 12:06:01 +02: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
Patricio Cano 10528341c2 Merge branch 'master' into feature_password_strength_indicator 2014-10-22 12:44:23 -05:00
Patricio Cano 91c96b3714 Added a password strength indicator
to the reset password view and the change password view after first login.
Updated JS to work with the updated views.
2014-10-22 12:40:41 -05:00
Dmitriy Zaporozhets 18ba6987cd Merge branch 'fix_milestone_link' into 'master'
Fix milestone link in issue page. Closes #174

For a complete description see #174.

See merge request !196
2014-10-22 14:15:33 +00:00
Dmitriy Zaporozhets d0296fc915 Merge branch 'master' into 'master'
fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono"

Everything is better than "Courier New" ...

See merge request !210
2014-10-22 13:52:09 +00:00
Marin JankovskiandMarin Jankovski ed00ab7521 Merge branch 'fix-500-login-disabled' into 'master'
Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209
2014-10-22 15:24:40 +02:00
Dmitriy Zaporozhets b0ef23c193 Fix 500 error on login page if ldap enabled and sign-in disabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-22 13:38:47 +03:00
Ciro Santilli ab1ad3bd18 Only run namespace select js when needed
Only needed in admin/projects.
2014-10-21 22:54:22 +02:00
Ciro Santilli 3418f56a69 Better js -> URL map to reduce unneeded execution 2014-10-21 22:44:02 +02:00
Ciro Santilli 93e8a0563d Only run profile js on pages that need it 2014-10-21 21:55:44 +02:00
Ciro Santilli 0e70e3b557 Remove whitespace link between user group avatars 2014-10-21 20:19:07 +02:00
Marin JankovskiandValery Sizov 9f54397f3a Use allowed slack team name. 2014-10-21 14:35:04 +03:00
Valery Sizov fbe9b00fc9 Merge branch 'slack_team_name' into 'master'
Slack team name

Fixes a problem in slack team name with hyphens.

https://gitlab.com/gitlab-org/gitlab-ce/issues/701

See merge request !1204
2014-10-21 11:19:52 +00:00
Dmitriy Zaporozhets 6c8d3bd658 Merge pull request #8093 from cirosantilli/rm-duplicate-derived-admin-repository-method
Remove unused admin/projects#repository method
2014-10-21 13:01:07 +03:00
Marin Jankovski ce61de68ba Use allowed slack team name. 2014-10-21 11:38:41 +02:00
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names
Factor admin logs [failure unrelated]
2014-10-21 11:59:41 +03:00
Dmitriy Zaporozhets c36a9e4cbf Merge pull request #8029 from cirosantilli/rm-projects-controller-filter
Remove unused filter from ProjectsController
2014-10-21 11:58:08 +03:00
Ciro Santilli 2c98584a9c Remove unused admin/projects#repository method
Already defined on the ApplicationController base class.
2014-10-21 10:56:11 +02:00
Dmitriy Zaporozhets 1657750a6a Merge pull request #8028 from cirosantilli/rm-dev-tools
Remove unused dev_tools helper.
2014-10-21 11:55:36 +03:00
Ciro Santilli 38670a663c Only run avatar chooser Js on pages that need it 2014-10-21 10:46:55 +02:00
Dmitriy Zaporozhets c3b81e5f40 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-21 11:44:18 +03:00
Dmitriy Zaporozhets 8ad9a75f88 Merge pull request #8030 from cirosantilli/factor-authorize
Factor authorize_push! and authorize_code_access!
2014-10-21 11:43:12 +03:00
Dmitriy Zaporozhets 5ce9f89c7b Merge pull request #8102 from cirosantilli/use-memoized-project
Use @project on controllers, don't call method
2014-10-21 11:41:03 +03:00
Dmitriy Zaporozhets 456de99b9b Merge pull request #8101 from cirosantilli/rm-project-id-admin-project-controller
Remove param[:project_id] at admin controller
2014-10-21 11:40:46 +03:00
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms
Factor group forms
2014-10-21 11:39:41 +03:00
Dmitriy Zaporozhets d545bb8de4 Merge pull request #8097 from cirosantilli/dry-mentioned-in
DRY mentioned in magic note constant
2014-10-21 11:39:02 +03:00
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03:00