root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
12,466 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

6135 Commits

Author SHA1 Message Date
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
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
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag 
Use button type=submit instead of input.
 2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets beabf5db8c Merge pull request #8091 from cirosantilli/factor-ability-abilities 
Factor abilities methods
 2014-10-28 12:09:55 +02:00
Dmitriy Zaporozhets 26175e4459 Merge pull request #8127 from cirosantilli/user-select-js-only-needed 
Run user select Js only where needed
 2014-10-28 12:08:57 +02:00
Dmitriy Zaporozhets 01441f544e Merge pull request #8120 from cirosantilli/profile-js-only-needed 
Only run profile js on pages that need it
 2014-10-27 20:01:47 +02:00
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
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
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
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
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 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 Jankovski 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 Santilli db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03:00
Robert Schilling ad774c2017 Merge pull request #8110 from cirosantilli/coffee-uniform-export 
Export all coffee classes with @
 2014-10-21 09:11:58 +02:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button 
Factor choose group avatar button
 2014-10-21 08:25:09 +02:00