deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2750 commits 6 branches 43 tags 25 MiB
Commit graph

1671 commits

Author SHA1 Message Date
Robert Speicher
6471d8c652 Change @project instance variable to a local in views/help/markdown 
It was erroneously appending the project name to the page's title, even
though the Help system isn't specific to one project.
 2012-09-04 03:18:26 -04:00
Robert Speicher
d29827433d Update User#identifier to conform to Gitolite 2.x's user pattern 
Also modifies the specs a bit because I can't help myself.

Closes #480
 2012-09-04 00:20:17 -04:00
Robert Speicher
b44e9a08d5 Add Milestone link to API help TOC 
[ci skip]
 2012-09-03 20:38:41 -04:00
randx
5db2dbdcf1 fix browse file css 2012-09-03 22:57:34 +03:00
randx
f557686eb2 git clone panel available on files tab too 2012-09-03 22:30:14 +03:00
Alex Denisov
38b17e4e06 Merge branch 'master' into fix_project_access_notification 2012-09-03 22:20:29 +03:00
randx
8ca0b75d05 Tables refactored 2012-09-03 21:53:16 +03:00
Alex Denisov
af63607a5c test_after_commit gem added 2012-09-03 21:46:17 +03:00
Alex Denisov
1f1c8094fe After commit instead of after_update 2012-09-03 20:48:38 +03:00
Dmitriy Zaporozhets
c7cfe3d83b devise session templates to haml. Fix problem with missing message in commit 2012-09-03 08:15:07 +03:00
Dmitriy Zaporozhets
6997543ac2 Merge pull request #1351 from tsigo/nonrelative_resque 
Give Resque route a name and use that for the iframe src
 2012-09-02 11:58:13 -07:00
Dmitriy Zaporozhets
f9711cd81a Merge pull request #1355 from tsigo/gfm_spec_cleanup 
GFM spec redesign
 2012-09-02 11:57:33 -07:00
Robert Speicher
40d619107f Add link_title to CommitDecorator 2012-09-02 13:40:14 -04:00
Robert Speicher
8db2a59d0b Add StaticModel role, and add it to Commit model 
Instead of doing this:

    link_to(commit.id, project_commit_path(project, id: commit.id))
    Note.create(noteable_id: commit.id, noteable_type: "Commit", ...)

It lets us do this:

    link_to(commit.id, project_commit_path(project, commit))
    Note.create(noteable: commit, ...)
 2012-09-02 13:40:07 -04:00
randx
aecbd313bc Fix glm by adding id and classes to sanitize white attrs 2012-09-02 15:25:54 +03:00
randx
beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
randx
adeeae9f73 Few fixes for ~ 1000px resolution 2012-09-01 22:21:28 +03:00
Robert Speicher
0de5d08e37 Give Resque route a name and use that for the iframe src 
Closes #1350
 2012-08-31 19:28:32 -04:00
Florian Unglaub
0dd94cd86e DRY'ed up the user model 2012-08-31 16:44:23 +02:00
Florian Unglaub
1b0198f1d3 save newly created users directly in the model 2012-08-31 16:24:12 +02:00
Florian Unglaub
6d6c7a17ea Allow single-sign-on with Omniauth 2012-08-31 15:45:50 +02:00
Dmitriy Zaporozhets
ed954ebae2 Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications 
Issue status changed notifications
 2012-08-31 00:51:31 -07:00
randx
65abd8b20a Freeze project path in admin area 2012-08-31 09:05:44 +03:00
randx
5e510ada7a Js validation for title presence in issue, mr, milestone 2012-08-30 22:28:45 +03:00
randx
b9ff0c79b4 Changed filters to readable one. Styled some stuff 2012-08-30 22:15:34 +03:00
randx
4a6596af27 Fixed bunch of js bugs with comments. Also added development tips 2012-08-30 21:31:55 +03:00
randx
92137b7beb Removed class 'small' for some buttons. Fixed issue creation 2012-08-30 20:00:16 +03:00
randx
d246a68a24 fix project.last_activity spec 2012-08-30 19:45:05 +03:00
Dmitriy Zaporozhets
cd3d50caf2 Changed colors for buttons. Imporved preview area. Added clone panel to empty project 2012-08-30 09:27:02 +03:00
Dmitriy Zaporozhets
4e47402852 Fixed project last_activity. Links color changed a bit 2012-08-30 09:09:42 +03:00
Dmitriy Zaporozhets
793db070f0 Restyled projects list on dashboard 2012-08-30 08:13:36 +03:00
randx
51558bd57a Refactoring scss & improving some UI elements 2012-08-29 22:29:50 +03:00
randx
1dd938d20c SCSS refactoring & cleanup. First iteration 2012-08-29 21:23:43 +03:00
Alex Denisov
2703fe3e72 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:42:15 +03:00
Alex Denisov
05af5655a7 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:21:14 +03:00
Alex Denisov
43cad71f1a Duplicate code removed from IssueObserver#after_update 2012-08-29 10:50:35 +03:00
Alex Denisov
2cb0a62f7d Notification sends to issue author and assignee if issue being reopened or closed 2012-08-29 10:48:17 +03:00
Alex Denisov
4d65532158 Issue_status_changed email added 2012-08-29 09:49:39 +03:00
randx
e5adca1b81 Preview as button. Disable note submit unless content 2012-08-29 08:13:38 +03:00
Robert Speicher
8a49cdc3b4 Add milestone API docs to doc/README and views/help/api 
Also removes `closed` attribute option from create action.
 2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets
adc71b6a6a Fix test i broke with ssk key validation. Added Key.user_id as attr_protected 2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets
5afb16e496 Add ssh key validation 2012-08-29 07:13:29 +03:00
randx
ad3a88cfd3 Prepared for gitolite v3 2012-08-29 02:03:04 +03:00
Dmitriy Zaporozhets
1f5e2658f5 Merge pull request #1412 from tsigo/more_coffeescript 
Convert main.js to CoffeeScript
 2012-09-09 06:48:33 -07:00
Robert Speicher
5dcca7e480 Remove some JS that is no longer used 2012-09-09 07:28:42 -04:00
Robert Speicher
3551df8eb1 Minor main.js refactor and docs 2012-09-09 07:28:41 -04:00
Robert Speicher
ad1aa517c7 Add "enable" and "disable" jQuery functions 
Handles (un)setting the disabled attribute and adding/removing the
'disabled' class
 2012-09-09 07:28:41 -04:00
Robert Speicher
3b89f14090 Convert main.js to coffee 
Remove duplicate 's' hotkey code
 2012-09-09 07:28:41 -04:00
Robert Speicher
93daa8c568 Move main.js to main.js.coffee 2012-09-09 07:28:41 -04:00
Robert Speicher
1c01536829 Fix spelling of "empty" in disableButtonIfEmptyField function name 2012-09-09 07:28:41 -04:00
Dmitriy Zaporozhets
2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
miks
2e76342d72 typo fixed 2012-09-08 12:37:23 +03:00
miks
4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
miks
2dc0519277 bulk access roles update/deletion added 2012-09-06 23:14:42 +03:00
Robert Speicher
52c521ffe8 Use GitHub::Markup to parse markup files 
Closes #1382
 2012-09-05 16:52:49 -04:00
Robert Speicher
b78fd0c130 Add github-markup gem 2012-09-05 16:50:03 -04:00
randx
b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
randx
7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Riyad Preukschas
1f1ce5fbd4 Revamp GFM user docs. 2012-08-27 21:20:26 +02:00
Riyad Preukschas
806695f491 Split and reformat markdown options and add refs to their docs. 
Also add hard_wrap option.
 2012-08-27 21:20:13 +02:00
Riyad Preukschas
58a581782b Update forms to show consistent link to GFM. 2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets
cb35a80e49 Merge pull request #993 from veprbl/fix_archiving_prefix 
Download button: put files into a directory
 2012-08-27 11:04:00 -07:00
Dmitriy Zaporozhets
cb6fcb6562 Merge pull request #1301 from Mikulas/help-web-hooks-typo 
fix web hooks help view commit count off by one
 2012-08-27 04:58:32 -07:00
Dmitriy Zaporozhets
65444ba311 Merge pull request #1307 from purwandi/master 
use high quality icon on folder icon
 2012-08-27 01:33:06 -07:00
Purwandi
28cc4de267 Replace folder icon to use high quality 2012-08-27 12:43:28 +07:00
Alex Denisov
3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov
aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
randx
2c32574ac3 Project git clone panel 2012-08-25 23:39:01 +03:00
Dmitriy Zaporozhets
efde86537a Merge pull request #1110 from gliptak/patch-1 
Display configured git repository location on error page
 2012-08-25 13:04:41 -07:00
Dmitriy Zaporozhets
79e936e632 Merge pull request #1300 from tsigo/spec_reorganize 
Spec cleanup/reorganization
 2012-08-25 13:03:44 -07:00
Mikuláš Dítě
e0cd807020 fix web hooks help view commit count off by one 2012-08-25 20:48:30 +02:00
Robert Speicher
580ce4f2d8 Minor cleanup to Milestone model and spec 
Back-ported from my still-in-progress major cleanup.
 2012-08-25 14:19:16 -04:00
randx
6ff0652e9e Admin area -> user form 2012-08-25 20:31:19 +03:00
randx
f13bccc14b better flash message style 2012-08-25 19:47:00 +03:00
randx
c05692b7b1 scss refactoring 2012-08-25 19:42:34 +03:00
randx
fee26c58e2 Move snippets api doc to separate file 2012-08-25 19:21:11 +03:00
Florian Unglaub
36ffdf36b9 Merge issue fixed 2012-08-24 15:40:44 +02:00
Florian Unglaub
48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx
d5fcf0f672 Show labels specific to project 2012-08-24 15:34:27 +03:00
Dmitriy Zaporozhets
8d65f51e63 Merge pull request #1295 from jouve/fix_mr_form 
fix merge request form
 2012-08-25 06:16:40 -07:00
Joe Hillenbrand
0dbde913dc Hide gravatar tip if gravatar is disabled. 2012-08-24 16:04:07 -07:00
Cyril
2b38f51a17 fix merge request form 2012-08-25 00:22:45 +02:00
randx
3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
Dmitriy Zaporozhets
52f657aa15 Merge pull request #1286 from steveklabnik/master 
Misspelled Draper
 2012-08-24 01:29:52 -07:00
Steve Klabnik
f9ab136abd Misspelled Draper 
:)
 2012-08-23 17:01:30 -07:00
Cyril
e2f19befbc fix inline forms 2012-08-23 23:04:43 +02:00
Riyad Preukschas
32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
Dmitriy Zaporozhets
0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes 
Preview window is not closed after post
 2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets
7ab587a477 Merge pull request #1263 from dosire/merge_base_for_merge_request 
Show only the commits that are newer in the merge request.
 2012-08-23 00:32:37 -07:00
Dmitriy Zaporozhets
1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar 
Allow disabling Gravatars in gitlab.yml settings
 2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets
aa50408ecb 1. Better message if no ssh key 
2. SSH Keys Help page
 2012-08-22 03:56:53 +03:00
Sytse Sijbrandij
9ec4c2d214 Show only the commits that are newer in the merge request. 2012-08-21 23:07:11 +02:00
randx
3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx
f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx
7fa6a23416 Better fonts for all code like wiki etc 2012-08-21 20:53:33 +03:00
randx
c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets
2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx
366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap 
Conflicts:
	app/models/user.rb
 2012-08-21 08:39:23 +03:00
Robert Speicher
c5b13cc989 Remove more duplication in the Notify mailer 2012-08-20 23:18:57 -04:00
Robert Speicher
652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00
randx
b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
Jakub Jirutka
335b3ed197 fix condition in find_for_ldap_auth 2012-08-20 12:58:03 +02:00
randx
d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
randx
8eaead6a01 Text message for mergeing MR 2012-08-19 00:45:46 +03:00
randx
7530fa9dec Restored margin for text in notes 2012-08-19 00:08:20 +03:00
randx
3f9749dd86 Fix branch selector. Few css fixed also 2012-08-18 23:53:58 +03:00
Florian Unglaub
a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets
93401ef988 Few css improvements 2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets
813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
Dmitriy Zaporozhets
4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter 
Allow filtering issues that have no milestone or assignee
 2012-08-16 22:33:56 -07:00
Robert Speicher
feee3838e1 Combine unassigned_issue and unassigned_milestone into unassigned_filter 2012-08-16 18:13:22 -04:00
Robert Speicher
66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets
05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Robert Speicher
65bcc41f3e Allow disabling Gravatars in gitlab.yml settings 
Closes #1237
 2012-08-15 21:06:08 -04:00
Martin Bastien
6641761e5c Fix current class for hooks tab in admin section 
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
 2012-08-15 00:03:13 -04:00
Robert Speicher
70174a1e1a More minor translation/grammar fixes on error pages 2012-08-14 17:26:38 -04:00
Robert Speicher
b039a16946 GFM refactor: Move the actual parsing to a class under the Gitlab module 2012-08-14 04:37:18 -04:00
Robert Speicher
e31a9dd253 GFM refactor: Update pattern to avoid an extra HTML entities check 2012-08-14 04:33:46 -04:00
Robert Speicher
d1d19aecde GFM refactor: Simplify the regex pattern 
Makes use of 'extended' patterns to add comments to the groups, and also
reduces the total number of groups to just those that are used.
 2012-08-14 04:33:41 -04:00
Nihad Abbasov
0b7e67ad12 fix note preview link, and hide preview and errors after posting a comment 2012-08-14 01:24:27 -07:00
Robert Speicher
6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher
5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Dmitriy Zaporozhets
6ebd360cf2 Modern theme restyled. Better Profile -> Ui page 2012-08-13 08:52:10 +03:00
Robert Speicher
b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04:00
randx
bd0c971aa9 Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard 
Conflicts:
	app/views/events/_commit.html.haml
 2012-08-12 00:33:32 +03:00
randx
731b6be9c9 Handle app crash on huge commits 2012-08-11 15:59:36 +03:00
Robert Speicher
7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Cyril
15fc0f0c10 fix commit events on dashboard 2012-08-10 21:23:54 +02:00
Dmitriy Zaporozhets
1413c23c50 Merge pull request #1208 from tsigo/issue_commonality 
Consolidate functionality shared between Issue and MergeRequest
 2012-08-10 06:48:16 -07:00
Dmitriy Zaporozhets
5fd0e7ba11 Merge pull request #1198 from NARKOZ/preview_notes 
ability to preview notes
 2012-08-10 06:42:31 -07:00
Nihad Abbasov
9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
Robert Speicher
b7f9b8223e Fix search class method for IssueCommonality 
Also adds specs to the two affected classes that would have caught my
dumb mistake.
 2012-08-09 13:45:12 -04:00
Robert Speicher
f36f0dac9d Consolidate functionality shared between Issue and MergeRequest 
Any associations, validations, delegates, scopes and methods that
were exactly the same in both Issue and MergeRequest models have been
moved to a new IssueCommonality module (role) that gets included by each
class.

There was actually quite a bit of duplication, because MergeRequests are
basically just specialized Issues.
 2012-08-08 21:44:33 -04:00
Robert Speicher
7a4c958882 Add empty IssueCommonality module; include in Issue and MergeRequest 2012-08-08 21:26:56 -04:00
Dmitriy Zaporozhets
839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Dmitriy Zaporozhets
8ffb6126a9 slim comment form 2012-08-09 06:36:55 +03:00
Dmitriy Zaporozhets
a76adfa472 Fixed gfm mailer 2012-08-09 06:02:55 +03:00
randx
f197fa1fbf Fix github issue #1153 2012-08-08 17:08:43 +03:00
randx
04bad8257f Fixed markdown tests 2012-08-08 11:52:09 +03:00
Nihad Abbasov
1ec3bd3f8d ability to preview notes 2012-08-08 01:12:05 -07:00
Jakub Jirutka
ad265b9610 Adding workaround for backward compatibility with legacy LDAP users 2012-08-05 11:27:17 +02:00
randx
6171a4d8eb Fixed dashboard broken messages cause of glm 2012-08-03 03:28:02 +03:00
randx
34ba4e1352 Gitlab Markdown help page 2012-08-03 00:20:09 +03:00
Riyad Preukschas
5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas
9a0b763eec Fix missing @project errors 2012-08-06 03:16:06 +02:00
Riyad Preukschas
6f9428b1cd Fix GFM helper to raise an exception when @project is not set 2012-08-06 02:32:17 +02:00
Riyad Preukschas
8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Valeriy Sizov
1c60c3d73d Merge pull request #1147 from miks/master 
Add automatic HTML id attributes to markdown headings to allow linking to content sections in wiki
 2012-08-04 10:30:05 -07:00
Valeriy Sizov
c757924902 Merge pull request #1184 from karuna/master 
Hook url should be able to contain http basic authentication
 2012-08-04 10:17:14 -07:00
randx
7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00
randx
9b4c41f826 Fix github issue #1190 2012-08-02 09:07:01 +03:00
Valeriy Sizov
3079687b93 Merge pull request #1179 from robbytaylor/master 
Grammar fix after creating a project
 2012-08-02 09:27:10 -07:00
gitlab system
9912770c6f make hooks respect http basic authentication 2012-08-02 09:48:46 +07:00
Riyad Preukschas
eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Riyad Preukschas
0a60b19b23 Remove the commit_msg_with_link_to_issues helper and specs 2012-08-02 02:54:10 +02:00
Riyad Preukschas
6873d07f62 Add link_to_gfm helper and specs 2012-08-02 02:54:01 +02:00
Riyad Preukschas
8ce390333a Add GFM helper 2012-08-02 02:41:49 +02:00
Riyad Preukschas
e1b4e22e5c Add render context to markdown renderer 2012-08-01 17:37:12 +02:00
Rob Taylor
516a76c9a9 Fixed grammar in 'please wait' message after creating project 2012-08-01 11:19:20 +01:00
Jakub Jirutka
fa5a53f5ed Change identification of users with extern auth provider (LDAP) 2012-07-29 16:15:52 +02:00
randx
e8261313a7 Fixed firefox css bug with issues table 2012-07-28 05:43:34 +03:00
randx
00b280c3f9 Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
Dmitriy Zaporozhets
5926bbac12 Backend Refactoring 2012-07-31 08:32:49 +03:00
randx
69e41250d1 Styled New/Edit Project for admin area 2012-07-28 00:42:44 +03:00
randx
2cf5a9efbc Better name for Project push methods module 2012-07-29 20:08:58 +03:00
randx
c6034af44e Styled Source Browse 2012-07-29 12:51:58 +03:00
randx
c2817e6f3a Team Member Profile: Remove button rebased 2012-07-29 01:40:21 +03:00
randx
4c1267e09f CSS refactoring. Notes better styled 2012-07-29 01:34:51 +03:00
Dmitriy Zaporozhets
e1344a08f0 Merge pull request #1163 from tomykaira/bug_1009 
Fix #1009 Replace all special characters in user's identity
 2012-07-28 07:46:40 -07:00
Dmitriy Zaporozhets
354d243878 Merge pull request #983 from JamesEarlDouglas/notify-grammar 
cleanup the wording of the notification footer
 2012-07-28 07:38:17 -07:00
tomykaira
03a2995e15 Fix #1009 Replace all special characters in user's identity 2012-07-28 22:05:25 +09:00
randx
bc7897180d Better visibility of event commit links & commits ids 2012-07-28 00:27:54 +03:00
randx
9a709f76be Fix issue padding cause PR 1144 2012-07-27 23:57:42 +03:00
Dmitriy Zaporozhets
f69049c282 Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased 
Break up links with nested formating (rebased)
 2012-07-27 13:48:05 -07:00
randx
0590aa9d60 commit.short_id as model method. Styled inline comment form 2012-07-27 11:22:05 +03:00
randx
18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
randx
c27105f8c3 Fixed dashboard loader, fixed 404 for reporter on empty wiki page. 
Styled Wiki edit page
 2012-07-26 14:45:17 +03:00
miks
1127c98490 Add automatic HTML id attributes to markdown headings to allow linking 
to content sections in wiki
 2012-07-26 11:47:17 +03:00
Riyad Preukschas
f6a67ef207 Update links in events 2012-07-25 22:27:25 +03:00
Riyad Preukschas
6fc6833cdb Fix styles 
* don't show pointer cursor for for the whole list item any more
* fix hover color for links in .row_title
 2012-07-25 21:11:58 +02:00
Riyad Preukschas
0aee7c94d0 Update links to milestones 2012-07-25 21:11:58 +02:00
Riyad Preukschas
e6bb4f1491 Update links to merge requests 2012-07-25 21:11:58 +02:00
Riyad Preukschas
73dabcb357 Update links to issues 2012-07-25 21:11:58 +02:00
Riyad Preukschas
cbce4528d0 Update links to commits 2012-07-25 21:11:58 +02:00
randx
14c9723724 Styled wiki area. fixed commit feed feature 2012-07-25 22:08:47 +03:00
randx
501ca8e6e8 Fix compare crash after decorator refactoring 2012-07-25 21:45:53 +03:00
randx
0296121f08 Remove recreated mailer controller for admin 2012-07-25 21:38:33 +03:00
randx
61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments 
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
 2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets
5133541f25 Merge pull request #1127 from riyad/use-decorators 
Use CommitDecorator more
 2012-07-25 11:25:55 -07:00
Dmitriy Zaporozhets
05848512bf Merge pull request #1133 from robbytaylor/master 
Updated merge request subheading.
 2012-07-25 11:22:03 -07:00
Dmitriy Zaporozhets
92d98f5a0c Merge pull request #1118 from patthoyts/pt/ldap-missing-password 
Handle LDAP missing credentials error with a flash message.
 2012-07-25 01:51:06 -07:00
Nihad Abbasov
fbb41100db update help section with issues API docs 2012-07-24 05:52:43 -07:00
Rob Taylor
dce6f7beb4 Updated merge request subheading. 
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
 2012-07-24 11:22:13 +01:00
Riyad Preukschas
34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +02:00
Riyad Preukschas
ff40b7de7a Add CommitDecorator#short_id 2012-07-21 19:59:55 +02:00
Pat Thoyts
a2d244ec06 Handle LDAP missing credentials error with a flash message. 
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.

The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit f322975.

This resolves issue #1077.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-21 09:04:05 +01:00
randx
11721b0dbe Help section for system hooks completed 2012-07-21 10:47:57 +03:00
randx
9c8a1e6517 Fix system hook example 2012-07-21 10:32:42 +03:00
randx
4261acda90 move SSH keys tab closer to begining 2012-07-21 10:27:09 +03:00
randx
a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Pat Thoyts
787e5e94ac Fix english on the edit user form. 
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-20 22:18:42 +01:00
Ian Morgan
04a85f4582 Show wiki comments for all revisions 2012-07-20 13:16:19 -04:00
Dmitriy Zaporozhets
9267cb04b0 Merge branch 'refactoring_controllers' of dev.gitlabhq.com:gitlabhq 2012-07-20 14:24:56 +00:00
Dmitriy Zaporozhets
791208431c Box shadow for boxes 2012-07-20 08:39:34 +03:00
Dmitriy Zaporozhets
3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Dmitriy Zaporozhets
3063af5adc BaseContext 
Controllers refactoring with contexts
Move commit compare logic to model
 2012-07-20 08:39:34 +03:00
Ian Morgan
36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
Valeriy Sizov
d9cd6269e9 System Hooks: move callback to observer 2012-07-20 01:01:29 +03:00
gliptak
44ec5579bd Display configured git repository location on error page (this is partially addressing issue #1072) 2012-07-19 12:39:02 -03:00
Dmitriy Zaporozhets
1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Valeriy Sizov
86bd11cbd8 System Hooks: rspec 2012-07-19 00:25:10 +03:00
Valeriy Sizov
655418bed2 System hooks: fix broken tests 2012-07-19 00:25:10 +03:00
Valeriy Sizov
f5908cef19 System Hook: implemented 2012-07-19 00:25:10 +03:00
Valeriy Sizov
c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Valeriy Sizov
65dc68b35c Refactoring of hook functionality & bootsrap system hooks 2012-07-19 00:25:10 +03:00
Valeriy Sizov
72a571724d Merge pull request #1096 from moregeek/show-flash-note-when-destroying-a-project 
show flash notice after deletion of a project
 2012-07-18 05:35:42 -07:00
Valeriy Sizov
3ac840ff06 Merge pull request #1100 from patthoyts/pt/ldap-no-email 
Improve handling of misconfigured LDAP accounts.
 2012-07-18 05:17:14 -07:00
Dmitriy Zaporozhets
8803350023 CHANGELOG updated. Fixed MR bug. Logger improved 2012-07-17 08:23:16 +03:00
Dmitriy Zaporozhets
494cd02b38 Colored labels for events on dashboard 2012-07-17 08:21:16 +03:00
Dmitriy Zaporozhets
a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
Dmitriy Zaporozhets
80f2ef2d02 MR index pollished 2012-07-17 08:17:16 +03:00
Pat Thoyts
f322975c50 Improve handling of misconfigured LDAP accounts. 
Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-16 23:31:28 +01:00
moregeek
990b9217d9 show flash notice after deletion of a project 2012-07-16 14:01:32 +02:00
Dmitriy Zaporozhets
2a705c4f40 Admin logs improved. Commits list box styled 2012-07-16 08:03:10 +03:00
Dmitriy Zaporozhets
f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
randx
1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
randx
b8425cf173 Last push widget improved 2012-07-10 21:26:41 +03:00
randx
d3862c0e57 CSS improvements & refactoring 2012-07-10 20:16:23 +03:00
Dmitriy Zaporozhets
1dca367f22 Merge pull request #1067 from SaitoWu/bugfix/encoding 
fix blame encoding error.
 2012-07-10 01:08:31 -07:00
Saito
c5b16f0998 fix blame encoding error. 2012-07-10 15:57:43 +08:00
Staicu Ionut
ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening 
buttons on forms are disabled on submit (re-enabled after the request is complete)
 2012-07-10 07:33:04 +03:00
randx
be1b40802d Api page in help 2012-07-06 03:05:12 +03:00
randx
6451e837bf Better event feed for dashboard 2012-07-06 02:16:41 +03:00
Dmitriy Zaporozhets
4c24cabf47 Merge pull request #1012 from NARKOZ/devise 
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
 2012-07-06 08:18:18 -07:00
Nihad Abbasov
6533711825 enable lockable strategy for users 2012-07-06 00:05:31 -07:00
Nihad Abbasov
2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets
9497b1a76e Compare images 2012-07-05 23:19:37 +03:00
Dmitriy Zaporozhets
31bc2b9495 Fix tree css class conflict 2012-07-06 16:42:13 +03:00
Dmitriy Zaporozhets
0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03:00
Dmitriy Zaporozhets
d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
randx
369df86e71 Remove GITLAB_OPTS, fixed ldap user creation 2012-07-05 21:29:37 +03:00
Dmitriy Zaporozhets
df6a75d52d buttons margin fixed 2012-07-05 09:35:23 +03:00
Dmitriy Zaporozhets
4e0c2f00d3 Merge pull request #1026 from gitlabhq/inline_diff 
Inline diff
 2012-07-04 22:45:52 -07:00
randx
264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
Dmitriy Zaporozhets
031ae7756e Refactored navigation 2012-07-03 20:52:48 +03:00
Dmitriy Zaporozhets
51f174b97f fix port issue 2012-07-03 18:52:48 +03:00
Valeriy Sizov
cecdb0b384 InlineDiff: refactoring 2012-07-02 23:34:25 +03:00
Valeriy Sizov
a09558921b InlineDiff: base implementation 2012-07-02 23:08:07 +03:00
randx
1d543e6430 Finished with configs 2012-07-02 21:59:48 +03:00
Dmitriy Zaporozhets
a2eda66b30 Disable issues sort. Recent issues on top. Fixed tests 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets
9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets
b3a0ee8e63 Fix MR tab width 2012-07-02 12:15:23 +03:00
Dmitriy Zaporozhets
15a03e1d87 Merge pull request #1023 from SaitoWu/feature/https 
Feature/https
 2012-07-02 01:52:23 -07:00
Saito
401340168c bypass gitolite update hook, and set an GL_USER variable. 2012-07-02 16:44:45 +08:00
randx
ec1b1588ee Improved header font 2012-07-01 13:11:17 +03:00
randx
f464d4c9f0 UI: Navifation -> full width tabs 2012-07-01 01:39:23 +03:00
randx
6a58deb536 UI changes: 
* .page_title  class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page

Backend changes:
* Gitab::Version && Gitlab::Revision constants
 2012-07-01 00:35:24 +03:00
James Earl Douglas
cc7369305c cleanup the wording of the notification footer 2012-06-29 12:52:38 -07:00
randx
ad3f4922ee Merge Request: fix automerge widget 2012-06-29 22:02:22 +03:00
randx
2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
Dmitriy Zaporozhets
f73d71810e Merge pull request #1018 from glebm/master 
Resque Authentication + iFrame view
 2012-06-29 04:53:43 -07:00
gleb
2da45e9cbf Refs #1013 
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
 2012-06-29 13:46:24 +02:00
Pierre GUINOISEAU
97d74c2adc Add configurable default for projects_limit 2012-06-29 12:57:33 +02:00
randx
335f9d6410 New Feature: Diff patch file export for commit 2012-06-28 12:51:50 +03:00
randx
a4ae4694a2 Fix issue #987 #972 2012-06-28 00:54:53 +03:00
randx
19d0dc3c04 Strict first project symdol to letter 2012-06-28 00:47:12 +03:00
randx
5f356d6928 Issues tags: refactoring 2012-06-27 23:13:44 +03:00
Dmitriy Zaporozhets
50fdb2e7df Remove critical status from Issue. Move sort instead 2012-06-27 21:30:35 +03:00
Dmitriy Zaporozhets
1b1e77c728 Issue Labels: Edit, show, index + filter 2012-06-27 21:20:35 +03:00
Dmitry Kalinkin
87d2a763e6 fix archiving prefix 2012-06-27 21:21:44 +04:00
Dmitriy Zaporozhets
4c1f435ab7 Merge pull request #971 from gingko/master 
Automatic password creation..
 2012-06-26 23:41:49 -07:00
Jakub Troszok
5ab1856291 Fixing requests tests. 2012-06-27 00:55:54 +02:00
Jakub Troszok
4426bc1844 Added option to automaticaly generate passwords for new users. 2012-06-26 23:59:08 +02:00
randx
1c8008c154 Informative search results page 2012-06-27 00:05:47 +03:00
randx
385ca60a6a issues_table css class 2012-06-26 23:34:23 +03:00
randx
cbca0457f8 Issues list more compact now 2012-06-26 22:23:49 +03:00
randx
88c625e3f7 Issues can be unassigned now 2012-06-26 21:47:25 +03:00
randx
6abc649590 Reannotated 2012-06-26 21:23:09 +03:00
randx
283bf80676 Comment icons for Issues, MR lists 2012-06-26 21:20:05 +03:00
Dmitriy Zaporozhets
d92446df1f Merge pull request #982 from JamesEarlDouglas/mailer-controller-typo 
fix typo: 'avaialble' -> 'available'
 2012-06-26 09:15:39 -07:00
James Earl Douglas
69ba86e887 fix typo: 'avaialble' -> 'available' 2012-06-26 09:17:23 -07:00
randx
0321a3c9b4 MR: merged badge. Removed colors from MR list 2012-06-26 19:08:44 +03:00
Jakub Troszok
56dbfd2af3 Implementing automatic password generation. 2012-06-24 22:38:29 +02:00
Jakub Troszok
9132d309ad Implementing automatic password creation. 2012-06-24 22:26:13 +02:00
randx
6d92aa6d12 Fix IssueObserver current_user assign. Refactored observers 2012-06-24 10:01:42 +03:00
randx
55f8338502 Merge branch 'separate_user_and_issue_observer_from_mail_observer' of https://github.com/robbkidd/gitlabhq into robbkidd-separate_user_and_issue_observer_from_mail_observer 2012-06-24 09:33:22 +03:00
Valeriy Sizov
1e1c5b7afe Diff refactoring 2012-06-24 01:14:45 +03:00
Valeriy Sizov
279c4262f9 small clean of CommitDecorator 2012-06-24 00:55:23 +03:00
randx
f3edea7ed7 Fixed network graph keyboard nav 2012-06-22 23:29:31 +03:00
randx
193804516b Fix project redirect after destroy 2012-06-22 22:48:03 +03:00
Nihad Abbasov
da5cf9d085 downgrade raphael js to 1.5.2 2012-06-22 01:57:05 -07:00
randx
b32465712b Up to 2.6 2012-06-21 20:25:23 +03:00
randx
1903f6ade0 admin area -> search for users 2012-06-21 19:05:09 +03:00
randx
98a45ce6ee admin area -> search for projecs 2012-06-21 18:54:57 +03:00
randx
77cf662034 Pushed widget improved 2012-06-21 18:41:22 +03:00
randx
2d16585eae Few minor css improvements 2012-06-21 17:23:25 +03:00
randx
e0805ec469 Backgrounds for Issues 2012-06-21 16:43:40 +03:00
Dmitriy Zaporozhets
75cf927d3b Issues & MR legend 2012-06-21 08:29:53 +03:00
Robb Kidd
65989141dc Protect IssueObserver#send_reassigned_email method. 2012-06-20 21:23:05 -04:00
Zevs
5fd2f7158e remove double negative 2012-06-21 00:21:13 +03:00
randx
d5b41831d1 missed ; 2012-06-20 23:08:10 +03:00
randx
1a05f2f7c9 Get rid of deprecated link_to_function 2012-06-20 21:29:55 +03:00
Robb Kidd
70c6b48ebc Remove :issue from MailerObserver; handled by IssueObserver now. 
:issue snuck back in during rebasing.
 2012-06-20 14:09:46 -04:00
Robb Kidd
eba61c111d Remove upvotes method from Issue. 
Must have snuck in during one of the multiple rebases while observers were
being refactored.
 2012-06-20 14:09:46 -04:00
Robb Kidd
88964132ed Extract observation of User to a UserObserver 2012-06-20 14:09:46 -04:00
Robb Kidd
97ca4f5dda Deliver issue mails. 
It helps to actually deliver messages.
 2012-06-20 14:09:46 -04:00
Robb Kidd
6617eaaf9b Make IssueObserver handle issus, not MailerObserver 2012-06-20 14:09:46 -04:00
Robb Kidd
356430c3c0 Add method for an issue to know whether it is being closed 
Update IssueObserver to create a Note on the issue its being closed.
 2012-06-20 14:09:46 -04:00
Robb Kidd
02924de3e1 Add method to Note to create notes about status changes. 2012-06-20 14:09:46 -04:00
Robb Kidd
00ec81eacb Update IssueObserver to send reassigned emails when an issue is reassigned. 2012-06-20 14:09:46 -04:00
Robb Kidd
2416e3cb19 Add new utility method for an issue to know whether it is being reassigned 2012-06-20 14:09:46 -04:00
Robb Kidd
f6035552e5 New IssueObserver class and spec. 
Handles emails for new issues and reassigned issues.
Need to add creating a Note on Issue close.
 2012-06-20 14:09:46 -04:00
Zevs
6507c1085e Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler." 
This reverts commit ef1598b4af.
 2012-06-20 21:01:27 +03:00
Zevs
a9c7de8815 Revert "Handle MR "show all commits" link with a doc-ready event handler." 
This reverts commit 5b1ede6280.
 2012-06-20 21:01:00 +03:00
Zevs
581a822326 Revert "Invert "unless .empty?" to "if .present?"; unless-else is evil." 
This reverts commit 7484bcfff7.
 2012-06-20 21:00:34 +03:00
Valeriy Sizov
65c35394eb Merge pull request #951 from robbkidd/remove_link_to_function 
Replace calls to deprecated link_to_function with doc-ready functions.
 2012-06-20 10:43:32 -07:00
randx
4ac0160a11 Hande error with huge commits 2012-06-20 20:08:18 +03:00
Wouter D'Haeseleer
c3d1f2eb9b make a hyperlink from the counted keys 
Refs Ticket #948
 2012-06-20 17:16:56 +02:00
Robb Kidd
ef1598b4af Handle Commit "show suppressed diff" link with a doc-ready event handler. 
Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
 2012-06-20 11:11:17 -04:00
Nathan Anderson
19a9cd7f9d Included good default font for Windows. 2012-06-19 07:56:09 -03:00
Nathan Anderson
77860f3537 Included good default for Windows and standardized <pre> font families 2012-06-19 07:55:01 -03:00
Dmitriy Zaporozhets
acdbc1b4c5 Better fonts for code 2012-06-19 13:48:39 +03:00
Valeriy Sizov
e27a1d31e0 Merge pull request #937 from jdamick/master 
Modified the login screen for primarily LDAP authentication
 2012-06-19 01:40:01 -07:00
Robb Kidd
5b1ede6280 Handle MR "show all commits" link with a doc-ready event handler. 
Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
 2012-06-18 18:36:25 -04:00
Robb Kidd
7484bcfff7 Invert "unless .empty?" to "if .present?"; unless-else is evil. 2012-06-18 18:32:46 -04:00
randx
034ddb85fe Assignee filter for issues 2012-06-18 20:50:06 +03:00
randx
2dd17623c9 Refactor code themes 2012-06-18 20:18:14 +03:00
randx
22d6dc2b3b Cucumber features: Team, SSH keys 2012-06-18 19:34:09 +03:00
jdamick
9a4e5a8bd5 removed dead code from the form 2012-06-18 11:51:17 -04:00
jdamick
848b5e99fc moved the ldap login to its own partial and cleaned up the forms a little bit 2012-06-18 11:45:49 -04:00
jdamick
50dabb5452 customizing the user login screen for primarily ldap authentication 2012-06-18 11:45:49 -04:00
Dmitriy Zaporozhets
dbc7ef21d1 Merge pull request #932 from gitlabhq/cucumber 
Cucumber
 2012-06-16 03:46:14 -07:00
randx
781fd1a80c Cucumber -> Dashboard features 2012-06-16 12:50:14 +03:00
Gosha Arinich
482f1a7d19 Add HTML anchors for comments #929 2012-06-15 18:53:00 +03:00
Ben Phelps
6ff99fe945 Change "in" to "ago" in last edited message. 2012-06-14 20:51:01 -05:00
Dmitriy Zaporozhets
a78908c697 mailObserver quickfix 2012-06-14 12:45:22 +03:00
Dmitriy Zaporozhets
72b9c14ebc refactored mail observer 2012-06-14 08:24:10 +03:00
Dmitriy Zaporozhets
f5ee330a13 Few css fixes for dark theme 2012-06-14 10:43:45 +03:00
randx
36e88b960a CSS refactoring 2012-06-13 20:02:30 +03:00
Nihad Abbasov
e735763f27 remove useless index method from projects controller 
see edd81a79c5
 2012-06-13 05:22:40 -07:00
Dmitriy Zaporozhets
a243253b10 Refactored project archive. Improved MR usability form 2012-06-13 09:03:53 +03:00
randx
edd81a79c5 Dashboard refactoring: 
* dashboard should be in dashboard controller not project index
* projects index removed
 2012-06-12 23:13:42 +03:00
randx
9ef9c58f55 Better UI for projects list on dahboard 2012-06-12 22:04:57 +03:00
randx
5f5cd2be13 ui-box style improved 2012-06-12 21:55:10 +03:00
randx
093159a868 Styled snippets. Raw button for snippet 2012-06-12 21:41:46 +03:00
randx
b96af79bb8 Specs for last push widget 2012-06-12 21:15:34 +03:00
Dmitriy Zaporozhets
e0d1fba15e Recent push event 2012-06-12 17:43:16 +03:00
Dmitriy Zaporozhets
40af6e1ad2 few improvements for ui 2012-06-12 16:36:27 +03:00
Dmitriy Zaporozhets
6fa95a3d34 CSS refactored 2012-06-12 14:58:44 +03:00
Dmitriy Zaporozhets
0e33bf6eb0 Refactored IssuesController 2012-06-12 11:31:38 +03:00
randx
04bf40a923 Refactored theme css, added Modern theme pre version 2012-06-11 20:52:32 +03:00
Dmitriy Zaporozhets
a6dad85d2f Get rid of modularity gem, Styled 'nothing here' message 2012-06-11 13:55:38 +03:00
Dmitriy Zaporozhets
0a70aca3b1 Models Refactoring: Move methods to roles 2012-06-07 15:44:57 +03:00
randx
2d68e7f4cd MR -> remove source branch -> UI pollished 2012-06-05 19:45:18 +03:00
Zevs
d6ed9920d6 #888 prevent to remove source_branch 2012-06-05 00:11:07 +03:00
Zevs
3b41b1839b ability to remove source branch after merge 2012-06-05 00:11:07 +03:00
Andrey Vakarev
3bd06d55e0 Remove trailing whitespaces and trailing lines 2012-06-04 01:37:27 +03:00
Andrey Vakarev
6ee4548c99 Removed empty helpers (probably auto-generated) 2012-06-03 22:32:40 +03:00
Andrey Vakarev
16b49124be Remove unused methods 2012-06-03 22:27:34 +03:00
Dmitriy Zaporozhets
a35a12980e Merge pull request #887 from nathanvda/improve_tag_count 
Improve performance when handling large repo's
 2012-06-03 08:05:54 -07:00
Dmitriy Zaporozhets
aadf9d607e Merge pull request #885 from avakarev/clean-up-application_helper 
Clean up application_helper.rb code
 2012-06-03 00:54:34 -07:00
nathanvda
3792d624b6 Use the faster alternative methods in grit to count tags and branches (which I added). This is much faster in all cases, but especially on large repositories the difference should be obvious. 2012-06-03 03:24:59 +02:00
Andrey Vakarev
2048750029 Clean up application_helper.rb code 2012-06-03 04:08:01 +03:00
Andrey Vakarev
fb4b571fa6 Clean up tab_helper.rb code 2012-06-03 03:58:49 +03:00
randx
cbea0af290 custom select styled, tree table no round borders 2012-06-02 01:00:29 +03:00
Dmitriy Zaporozhets
16427f4c40 Merge pull request #880 from NARKOZ/dashboard-feed 
Dashboard feed
 2012-06-01 07:25:54 -07:00
Nihad Abbasov
cc3c6ad0ef allow login via private token only for atom feeds 2012-06-01 06:56:28 -07:00
Nihad Abbasov
f8f6ff065e add projects atom feed 2012-05-31 23:42:02 -07:00
randx
96308f7534 Milestones: progressbar from bootstrap. Bradcrumbs styles 2012-06-01 00:10:52 +03:00
randx
17d4cac208 Rescue encoding error on controller level 2012-05-31 23:36:52 +03:00
randx
a719bfc931 Graph: navigation with keyboard 2012-05-31 23:31:17 +03:00
randx
78f4c789b3 Improved Commit diff -> Images. Red border for removed & green for added images 2012-05-30 21:02:30 +03:00
randx
b826a684c7 Fix MR modal bug 2012-05-30 19:46:09 +03:00
Dmitriy Zaporozhets
2cf8010792 Merge pull request #868 from SaitoWu/bugfix/encoding 
Bugfix/encoding
 2012-05-30 00:24:43 -07:00
Saito
34cc38b6f5 diff now no need to force_encoding to utf8 2012-05-30 11:56:48 +08:00
Saito
202807c21a remove detect_enoding. detect_encoding means force_encoding to the file.data's encoding, not encoding to utf8. will cause encoding problem. 2012-05-30 11:56:00 +08:00
Nihad Abbasov
7c7761099c fix deprecation warnings 2012-05-29 19:16:28 +05:00
Nihad Abbasov
058d80b336 fix file extension 
[ci skip]
 2012-05-29 18:55:55 +05:00
Nihad Abbasov
865cf830c4 get rid of unused assets, use gems instead 2012-05-29 18:45:18 +05:00
Nihad Abbasov
8c7caaa69c use chosen-rails 2012-05-29 17:50:10 +05:00
Nihad Abbasov
faa0ec7c63 cleanup User model 2012-05-29 17:13:41 +05:00
randx
89043d6b89 MR: Accept section polished. Show permission info 2012-05-28 20:19:54 +03:00
randx
020caf1274 Fixed wrong module name 2012-05-27 12:34:25 +03:00
randx
d72f8db08a Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding 
Conflicts:
	lib/gitlab/encode.rb
 2012-05-27 12:20:35 +03:00
Gabriel Mazetto
50c2c16a4d Better algorithm to deal with encodings. Moved fallback rescue message from view to encode library. 
This helps fix cases where UTF-8 is wrongly identified as ISO-8859-1. We will only try to convert strings if we are 100% sure about the charset, otherwise, we will fallback to UTF-8.
 2012-05-26 20:15:06 -03:00
randx
d29ec9d773 Images refactored, Feed icon replaced, Fixed comment form focus 2012-05-27 01:12:28 +03:00
Gabriel Mazetto
48a36851e6 It's dangerous to rescue errors here as it will hide bugs. define_tree_vars already catch all situations where something may not exist. 2012-05-26 15:56:11 -03:00
Gabriel Mazetto
39def0dcbb Better fix for encoding problems on rendering of inline file visualizations like README files. 2012-05-26 15:56:11 -03:00
Gabriel Mazetto
eb5749ed39 Fixed encoding problems with plain/text blobs being sent without charset. 2012-05-26 15:55:53 -03:00
randx
3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +03:00
Dmitriy Zaporozhets
ddc7568fec Milestone show, Team index: Better UI 2012-05-24 09:23:52 +03:00
Eric
837a78db2e fix merge_requests.html 2012-05-23 15:20:41 +06:00
Dmitriy Zaporozhets
1b2068eaa9 Gem updates & githost logger 
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
 2012-05-21 23:17:41 +03:00
Andrey Vakarev
fed1c98047 Refactoring: get rid of ruby antipattern unless/else and use if/else instead 2012-05-20 03:01:13 +03:00
Dmitriy Zaporozhets
f33cf247b6 Merge pull request #833 from Nek-/patch-utf8 
Added force utf8 encoding
 2012-05-19 03:34:20 -07:00
Dmitriy Zaporozhets
5d24082787 Preparing to v2.5 2012-05-19 13:17:34 +03:00
Nek
8c7c43b94f Added force utf8 encoding 2012-05-19 12:12:49 +02:00
Dmitriy Zaporozhets
860e3ab526 Event feed: Icons for some events 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
1e4d15b406 Password & token split up, icon to button for top panel 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
02dc256514 Branches pages polished. few css improvements 2012-05-18 00:23:18 +03:00