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
mikkyhouse
2b319d0496
Merge pull request #828 from CedricGatay/feature/chosen_0.9.8_searchContains
...
Chosen 0.9.8 + Autocomplete contains
2012-05-17 09:46:03 -07:00
Cedric Gatay
0bdcf2e1dc
Chosen 0.9.8 + Autocomplete contains
...
Bumped Chosen to 0.9.8 (latest) and added default option to allow autocompletes to find items containing entered text.
2012-05-17 18:41:15 +02:00
Dmitriy Zaporozhets
9cd8f7b082
New Feature: Git Blame for file
2012-05-17 19:11:45 +03:00
RickXing
4c503be0f1
fix bug in mailer
2012-05-17 14:30:24 +08:00
Demelziraptor
e5bbefc980
change find_or_first to work with default branch
2012-05-16 14:47:59 +01:00
Robb Kidd
991d23e216
Change calls to Notify methods to send IDs instead of objects.
2012-05-15 22:37:34 -04:00
Robb Kidd
e660043d22
Make Notify#new_merge_request_email resque friendly.
2012-05-15 22:37:34 -04:00
Robb Kidd
39061af9f8
Make Notify#new_issue_email resque friendly.
2012-05-15 22:37:34 -04:00
Robb Kidd
2d124d9496
Add delegate for project's name on Note.
2012-05-15 22:37:34 -04:00
Robb Kidd
41c00a20a9
Make Notify#note_wall_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:34 -04:00
Robb Kidd
0a9a2c2a0b
Make Notify#note_commit_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
2012-05-15 22:37:34 -04:00
Robb Kidd
435fd8f087
Make Notify#note_issue_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:34 -04:00
Robb Kidd
bb22360d1a
Make Notify#note_merge_request_email resque friendly
...
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
Robb Kidd
5fe75649b3
Rename changed_mr_email to reassigned_mr_email & make resque friendly
...
#changed_merge_request_email was really sending emails about merge
request reassignments. Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:37:33 -04:00
Robb Kidd
dd921053c8
Rename changed_issue_email to reassigned_issue_email & make resque friendly
...
#changed_issue_email was really sending emails about issue reassignments.
Updated method name to reflect that.
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
2012-05-15 22:35:53 -04:00
Robb Kidd
345f176a74
Update new_user_email to take id for User and perform find itself.
2012-05-15 22:35:53 -04:00
Dmitriy Zaporozhets
be79c9def9
CSS improvements for diff & file view
2012-05-15 19:35:18 +03:00
Nick Kugaevsky
6a4ae93f57
CSS fix: main menu buttons dividers
2012-05-15 18:50:27 +04:00
Nick Kugaevsky
451118f19a
Activity stream: event labels css fix — proper paddings.
2012-05-15 17:47:01 +04:00
Nick Kugaevsky
7406fb5b12
Activity stream: commit labels css fix — proper paddings and highlighting on hover.
2012-05-15 17:46:18 +04:00
Dmitriy Zaporozhets
fab42a612e
Merge pull request #814 from kugaevsky/patch-1
...
Minor headers styles in readme fix: increased line-height for h1..h4.
2012-05-15 01:08:30 -07:00
Dmitriy Zaporozhets
17bd6b13bc
Merge pull request #821 from oreofish/showmarkdown
...
show rendered file if it is .markdown file
2012-05-15 00:18:49 -07:00
RickXing
465a195117
show rendered file if it is .markdown file
2012-05-15 09:23:14 +08:00
Robb Kidd
e0b709266e
Fix missing call to MergeRequest.find in Notify#changed_merge_request_email
2012-05-14 20:19:28 -04:00
Nick Kugaevsky
c0fa68572e
Minor headers styles in readme fix: increased line-height for h1..h4.
2012-05-12 16:50:57 +04:00
RickXing
25b80767bd
use resque mailer to send mail background
2012-05-12 17:01:09 +08:00
Adnan Abdulhussein
f20c079375
spelling mistake 'successfull'
2012-05-03 20:35:15 +01:00
Valeriy Sizov
12bb1d8f39
Merge pull request #775 from netdata/gravatar_empty_issue
...
When the email address is empty gitlab will give a 500 error
2012-05-03 06:19:49 -07:00
Valeriy Sizov
28bc6c5247
Merge pull request #777 from netdata/Show_better_permissions_overview
...
Make permission overview structured
2012-05-03 06:17:37 -07:00
Wouter D'Haeseleer
babb6a1a6b
Define a default value as suggested by ariejan
2012-05-03 14:19:06 +02:00
Wouter D'Haeseleer
c808295e9e
Allow short project names
...
We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...
2012-05-03 12:53:24 +02:00
Wouter D'Haeseleer
edcbe1178c
Make permission overview structured
...
The current overview is a mess.
This pull commit will make it look more clean.
All permissions are alliged between the columns and the master rights
have been enchanced with all its rights.
2012-05-03 12:44:03 +02:00
Wouter D'Haeseleer
825d2d69af
When the email address is empty gitlab will give a 500 error
...
Since some conversion tools do commits with an empty commiters email
address gitlab will fail with a 500 error
2012-05-03 12:20:27 +02:00
Valery Sizov
43dcc9575a
Task #735 Automerge should not be checked on every load of MR show page
2012-04-27 00:53:55 +03:00
Dmitriy Zaporozhets
28cb43135c
Hooks UI improved, Request tests added
2012-04-26 20:43:12 +03:00
mgesmundo
7c59722ddc
Cosmetic change in menu
2012-04-26 11:55:46 +03:00
Valeriy Sizov
f72a5d11bd
Merge pull request #732 from mmozuras/ldap_name_utf8
...
Force utf-8 encoding for ldap omniauth_info.name
2012-04-24 13:59:27 -07:00
Dmitriy Zaporozhets
2746be6ce3
Home button should targeted on root page of context
2012-04-24 21:47:01 +03:00
gitlabhq
c9af8e7579
New project page improved. User profile improved. Show issues, participant on Milestone show page.
2012-04-24 21:49:34 +03:00
mmozuras
03cc55dba6
Force utf-8 encoding for ldap omniauth_info.name
2012-04-24 10:42:30 +03:00
gitlabhq
d97a9aa4a4
fixed email markdown
2012-04-23 15:32:56 +03:00
Dmitriy Zaporozhets
511d07c47c
Merge pull request #713 from gitlabhq/fast_automerge
...
Fast automerge
2012-04-22 06:38:39 -07:00
Valery Sizov
e5f8397fd4
fast automerge: done
2012-04-22 16:14:01 +03:00
Dmitriy Zaporozhets
71819dc344
logo changed for header
2012-04-22 16:01:59 +03:00
Valery Sizov
dcbb875c46
fast automerge: base implementation
2012-04-22 15:19:09 +03:00
Dmitriy Zaporozhets
08994f3f60
Merge remote-tracking branch 'origin/merge_button'
...
Conflicts:
app/assets/javascripts/merge_requests.js
db/schema.rb
2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets
7c8fbe8f7f
Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
2012-04-21 01:44:52 +03:00
Dmitriy Zaporozhets
9cb51c6ea2
Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
...
Conflicts:
Gemfile
Gemfile.lock
2012-04-21 01:44:15 +03:00
Dmitriy Zaporozhets
680ee045d8
Merge pull request #709 from blueyed/master
...
Fix typo: "less then" => "less than"
2012-04-20 15:27:53 -07:00
Dmitriy Zaporozhets
9c76bd9540
Project linguist integration
2012-04-21 01:26:22 +03:00
Daniel Hahler
c851639a75
Fix typo: "less then" => "less than".
2012-04-20 23:36:09 +02:00
Arthur Schreiber
5b6019f357
Using github's linguist to better detect filetypes and to do syntax highlighting.
2012-04-20 23:21:12 +02:00
Arthur Schreiber
c437e2d7d4
Switch to Redcarpet for Markdown Rendering.
...
This gives us Github Flavored Markdown, which is awesome.
2012-04-20 23:01:45 +02:00
Dmitriy Zaporozhets
9ee345750c
fixed admin root path for header
2012-04-20 22:51:57 +03:00
randx
35e21b3402
Admin dashboard
2012-04-20 19:41:49 +03:00
randx
1d601616a3
Pagination and better perfomance for projects page.
2012-04-20 19:11:49 +03:00
Dmitriy Zaporozhets
60bf502bf1
Merge pull request #698 from Sindacious/master
...
Display Milestones without a due date as active
2012-04-20 00:53:20 -07:00
Dmitriy Zaporozhets
1845429268
Use try for commit prev_commit_id detection
2012-04-19 23:35:35 +03:00
Dmitriy Zaporozhets
45b18365d5
Fix an issue with MR unavailable if remove source branch
2012-04-19 23:06:45 +03:00
James Newton
69fd4763d2
display milestones that are not marked with a due date as active
2012-04-19 13:24:02 -05:00
Ricky Elrod
3f1a004c47
Fix a few grammatical mistakes in profile view.
2012-04-19 08:01:58 -03:00
Tiago Ribeiro
8b5ef3c24f
Fixed typo in label
2012-04-18 02:34:14 +01:00
Dmitriy Zaporozhets
5ef3b38429
MR commits suppressed if too many. few icons
2012-04-17 22:08:07 +03:00
Dmitriy Zaporozhets
3b7998e197
Milestone filter for issues improved
2012-04-17 21:03:01 +03:00
Dmitriy Zaporozhets
ac7bb20682
fixed app crash on new issue via get
2012-04-17 20:35:27 +03:00
Dmitriy Zaporozhets
3250a024ef
1. Improved admin -> new project form
...
2. Fixed bug: post-receive file was not added when create project via admin
2012-04-17 20:27:18 +03:00
Dmitriy Zaporozhets
f1795a4911
Issues form improved, Show milestone for Issue show
2012-04-17 00:22:59 +03:00
Dmitriy Zaporozhets
c9def945d4
User blocking improved. Admin area styled
2012-04-16 23:33:03 +03:00
Valery Sizov
a8e4f3ed88
Auto-merge: 'already can not be merged' alert
2012-04-16 23:05:08 +03:00
Valery Sizov
8269a3a735
Auto-merge: checking via AJAX
2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets
c0df0cd70c
Commit header improved. finalize PR 667
2012-04-16 01:10:09 +03:00
Dmitriy Zaporozhets
a7ed8276d7
Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers
2012-04-15 21:01:35 +03:00
Arthur Schreiber
ad25dac8b6
Change the design a bit to look more like before.
2012-04-14 12:38:12 +02:00
Arthur Schreiber
d9ba277ee1
Make parent sha links nicer for merge commits.
2012-04-14 12:38:12 +02:00
Arthur Schreiber
c530543c1a
Nicer commit headers.
2012-04-14 12:38:12 +02:00
Dmitriy Zaporozhets
95fde9bd7a
Projects page as dashboard. Old dashboard removed
2012-04-14 11:20:45 +03:00
Dmitriy Zaporozhets
5f31989a05
Search improved
2012-04-14 11:16:11 +03:00
randx
497ee5fbbc
Ability to block user
2012-04-13 08:12:34 +03:00
Dmitriy Zaporozhets
fb6d4511a0
restored dark theme
2012-04-12 00:54:07 +03:00
Dmitriy Zaporozhets
0e62b1cbaa
preserve for code browse
2012-04-11 23:59:53 +03:00
Dmitriy Zaporozhets
088860de4e
feed few fixes
2012-04-11 23:50:13 +03:00
Dmitriy Zaporozhets
740e54c3fc
Merge pull request #667 from keikubo/master
...
The indents errors of pre blocks in haml
2012-04-11 13:34:15 -07:00
Dmitriy Zaporozhets
e7add858cf
bug fixes & bootstrap buttons
2012-04-11 23:32:45 +03:00
Dmitriy Zaporozhets
b7558a2063
Removed encoding monkey patch
2012-04-11 23:03:56 +03:00
Kei Kubo
42f04bf70c
bug fix: broken indents fixed in markdown rendered statements
2012-04-11 19:36:52 +00:00
Kei Kubo
700eec6672
added = preserve to some pre statements
2012-04-11 19:13:38 +00:00
Kei Kubo
51ca0abf10
bug fix: <pre> indent error fixed in projects/empty.html
2012-04-11 10:35:49 -07:00
Dmitriy Zaporozhets
52f6df7255
b2 ipad fixed
2012-04-10 21:53:30 +03:00
Dmitriy Zaporozhets
ba3c359fd5
b2 fixes
2012-04-10 21:39:04 +03:00
Dmitriy Zaporozhets
8f22834c4e
bootstrap 2 integration complete.
2012-04-10 20:50:27 +03:00
Dmitriy Zaporozhets
2587de74df
Minor fixes
2012-04-10 20:06:17 +03:00
randx
627efddf63
migrated to bootstrap 2
2012-04-10 08:51:08 +03:00
Dmitriy Zaporozhets
d98b183361
first pack of tests for milestones
2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets
23d950855d
Milestone basic scaffold
2012-04-09 00:28:58 +03:00
Dmitriy Zaporozhets
667edcdd75
Dashboard issues/mr pages improved
2012-04-08 00:18:32 +03:00
Dmitriy Zaporozhets
88974b500f
projects list on dashboard with commit links
2012-04-07 23:13:18 +03:00
Dmitriy Zaporozhets
2fa4aadb8f
fixed tree hover
2012-04-07 17:30:00 +03:00
Dmitriy Zaporozhets
8fa22de9ac
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-04-07 01:08:42 +03:00
Andrea Dal Ponte
f30d56494e
admin_user_path correction
2012-04-06 12:00:13 +02:00
randx
1a3ce182ea
tree view pollished
2012-04-06 08:48:58 +03:00
Dmitriy Zaporozhets
7909fba592
increased image preview size
2012-04-06 01:30:52 +03:00
Dmitriy Zaporozhets
86676476e6
Handling big commits & big diff
2012-04-06 01:00:15 +03:00
Dmitriy Zaporozhets
6e2a6d925f
cleanup after prev commit
2012-04-05 01:58:23 +03:00
Dmitriy Zaporozhets
80ddd2c09d
Better encoding handling. Updated grit
2012-04-05 01:51:49 +03:00
randx
897da534fa
Fix issues with push 600+ commits. refactored, improved push events
2012-04-04 07:39:04 +03:00
randx
eb2c1cd2e3
rollback to yaml
2012-04-04 02:59:58 +03:00
randx
911ce0d3e5
reverted event data
2012-04-04 02:59:58 +03:00
randx
82c8c42aee
Move all serialization to marshall
2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets
11e4709fde
fix compatibility with old events
2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets
a951e6f8ae
GitlabSerialize: cause of invalid yaml in some events we migrate to json serialization
2012-04-04 02:25:33 +03:00
Dmitriy Zaporozhets
8aa5076d68
pollished team index
2012-04-04 01:21:31 +03:00
Denis Novikov
8abaf05aa9
Force diff line to UTF-8 encoding - proper fix.
2012-04-03 18:43:07 +02:00
Dmitriy Zaporozhets
c40c627a3b
team profile restyled
2012-04-02 21:13:44 +03:00
Dmitriy Zaporozhets
a264ef2f03
fixed tree view compass
2012-04-02 20:29:39 +03:00
Dmitriy Zaporozhets
c9db6bb3f2
prevent app crash for events without git resources
2012-04-02 19:51:20 +03:00
Dmitriy Zaporozhets
00dc34e192
Events improved & refactored. Dashboard pollished
2012-04-02 00:24:45 +03:00
Dmitriy Zaporozhets
6ed5d9bc11
dashboard/projects page project selection ui improved
2012-04-01 00:23:34 +03:00
Dmitriy Zaporozhets
1ed831846d
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-03-31 15:59:42 +03:00
Dmitriy Zaporozhets
25924a9089
Email link https support
2012-03-31 15:59:06 +03:00
Dmitriy Zaporozhets
f145450415
fixed mr unmergable method
2012-03-31 13:48:30 +03:00
Dmitriy Zaporozhets
90748cf724
Merge Button v1 complete
2012-03-30 20:49:34 +03:00
Staicu Ionut
2b01c65e50
- when you add a new ssh key, the title field automatically fills with the email (if is present in the key sting)
2012-03-30 18:30:56 +03:00
randx
3824f9b372
Unverify MR on every push. Ajax for MR accept. better UI
2012-03-30 08:15:04 +03:00
randx
411d84f385
Better merge handling. show if MR can be accepted or not
2012-03-30 08:05:04 +03:00
Dmitriy Zaporozhets
cd74f9da91
Link for auto merge, db field for MR
2012-03-30 00:27:42 +03:00
randx
78d620b3b6
Raw gitlab automerge feature
2012-03-29 18:03:05 +03:00
Dmitriy Zaporozhets
8ee0993fdf
Event & Wiki models specs
2012-03-28 22:53:45 +03:00
randx
69ef81404c
UI improved, .main_box css class for show pages
2012-03-28 10:46:51 +03:00
randx
88d9569a33
Project model refactored. Modularity gem
2012-03-28 10:44:51 +03:00
Dmitriy Zaporozhets
bae4efa7cf
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
2012-03-28 00:31:22 +03:00
Dmitriy Zaporozhets
46906ca9db
Issues, Merge Request show page polished. Fixed +n overflow
2012-03-28 00:31:14 +03:00
Valeriy Sizov
341b6d546b
Merge pull request #586 from patthoyts/pt/ldap-auth-fix
...
Ensure LDAP provided email is always compared case-insensitively.
2012-03-27 13:09:06 -07:00
Valery Sizov
1bb804da7f
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-03-27 23:04:45 +03:00
Valery Sizov
442d5dbef2
fixed yellow background in markdown documents
2012-03-27 23:04:21 +03:00
Dmitriy Zaporozhets
1647f46b1f
Project show page polished
2012-03-26 23:11:15 +03:00
Dmitriy Zaporozhets
788de6f1c8
Better commit show page
2012-03-26 22:41:56 +03:00
Dmitriy Zaporozhets
7d56a51bdc
Js refactoring and ajax animation replaced
2012-03-26 21:41:58 +03:00
Dmitriy Zaporozhets
f1c534c68e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-03-26 20:30:06 +03:00
Gosha Arinich
73404f6281
there should be no space after '(' and before ')'
2012-03-26 12:11:02 +03:00
randx
dfe9f3674c
fix image width for markdown
2012-03-26 07:40:51 +03:00
Dmitriy Zaporozhets
39ea486e1f
Fixed specs. Some css fixes
2012-03-25 19:44:29 +03:00
Dmitriy Zaporozhets
8652cd8989
Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit.
2012-03-25 19:05:24 +03:00
Steven Verbeek
3c9a18a0bf
Forgot others for border radius
2012-03-24 18:31:01 -03:00
Steven Verbeek
54dc2d5c32
Changed Note to Comment
2012-03-24 18:19:26 -03:00
Steven Verbeek
d3cb694edb
Fixed icon, added helper
2012-03-24 14:42:45 -03:00
Steven Verbeek
c359db3852
Removed thumbs.db
2012-03-24 14:38:10 -03:00
Steven Verbeek
a805d3131f
Fixed line ending issues on windows.
2012-03-24 14:36:14 -03:00
Steven Verbeek
27244e0c9e
Fixed line ending issues on windows.
2012-03-24 14:01:38 -03:00
Steven Verbeek
c2c4424ff8
Started note attachment changes, and text changes
2012-03-24 13:57:01 -03:00
Steven Verbeek
597afb7ce2
Started note attachment changes, and text changes
2012-03-24 13:53:16 -03:00
Steven Verbeek
e5fa0bb127
Started note attachment changes, and text changes
2012-03-24 13:40:21 -03:00
Steven Verbeek
fb4c033aeb
Started note attachment changes, and text changes
2012-03-24 13:30:04 -03:00
Steven Verbeek
b91128cc6a
Started note attachment changes, and text changes
2012-03-24 13:26:25 -03:00
Steven Verbeek
194467b8f8
Started note attachment changes, and text changes
2012-03-24 13:19:20 -03:00
Steven Verbeek
46605c9175
Started note attachment changes, and text changes
2012-03-24 13:08:42 -03:00
Steven Verbeek
6c40e89853
merging upstream changes
2012-03-24 00:36:54 -03:00
Dmitriy Zaporozhets
1c6df8e075
Improved profile & team member show
2012-03-24 01:01:36 +02:00
Pat Thoyts
b9b65b8d4e
Ensure LDAP provided email is always compared case-insensitively.
...
LDAP databases may store email addresses in mixed case so
ensure we only work with a lower case version to avoid missing
a valid account after LDAP login.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-03-23 14:59:54 +00:00
Dmitriy Zaporozhets
fa8219e0a7
better MR list, dashboard pollished
2012-03-22 22:57:04 +02:00
Dmitriy Zaporozhets
81da8e46f2
Remove button for empty repo. Last push on dashboard. Better notes count indicator for issues
2012-03-22 22:28:02 +02:00
Dmitriy Zaporozhets
6f2c193204
Fix issues search
2012-03-22 20:09:47 +02:00
Dmitriy Zaporozhets
e241d1e670
Fix form label for ssl requests
2012-03-22 20:02:38 +02:00
randx
52d8ed9e4f
Pagination for Merge Requests. Fixed for issues
2012-03-22 00:09:57 +02:00
randx
755a894c91
Issues pagination
2012-03-22 00:09:56 +02:00
Valery Sizov
039b6db483
design improve of form of key
2012-03-22 00:09:53 +02:00
Valery Sizov
8bb4c6de56
improve how to merge tips
2012-03-21 23:59:12 +02:00
Steven Verbeek
fafc34b0db
merging upstream changes
2012-03-21 00:21:34 -03:00
Dmitriy Zaporozhets
b57faf9282
Push events polished
2012-03-20 23:59:35 +02:00
Steven Verbeek
35d0de8f36
merging upstream changes
2012-03-19 21:57:29 -03:00
Steven Verbeek
2a7cd2f1b5
Fixed tab indent.
2012-03-19 21:43:25 -03:00
Steven Verbeek
550274e136
Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments
2012-03-19 21:32:08 -03:00
Dmitriy Zaporozhets
cadf12c60c
Merged activities & projects pages
2012-03-20 00:05:35 +02:00
Dmitriy Zaporozhets
724ea16c34
Activities page added. Dashboard few specs. Preparing for 2.3
2012-03-19 22:52:16 +02:00
Steven Verbeek
c43ac3c721
Small fix.
2012-03-17 13:13:42 -03:00
Steven Verbeek
66d64ad4f4
Fixed code in issue details, changed form description to details.
2012-03-17 13:02:48 -03:00
Steven Verbeek
2228f1b1ad
Fix for readme code being yellow in code blocks (left it yellow outside code blocks)
2012-03-17 12:49:23 -03:00
Steven Verbeek
9cbd1aef20
Fixed row messed up. Started on overall look.
2012-03-17 03:31:38 -03:00
Steven Verbeek
aeed7da6d4
Fixed HR
2012-03-17 02:48:22 -03:00
Steven Verbeek
1c2c860c22
Fixed css issues with issues :)
2012-03-17 02:46:47 -03:00
Steven Verbeek
c93fda2737
Added markdown is enabled.
2012-03-17 02:24:51 -03:00
Steven Verbeek
1b96985025
Re-added back to issues list, but moved it above title. Added css to move issue meta data around.
2012-03-17 02:22:12 -03:00
Steven Verbeek
7712d81f9b
Moved OPEN and removed back link (you can easily click on issues to get to the same spot)
2012-03-17 02:17:04 -03:00
Steven Verbeek
3263f2e1ab
Fixed markdown.
2012-03-17 02:13:36 -03:00
Steven Verbeek
4dc1331676
Markdown for issue description, added issue title
2012-03-17 02:09:16 -03:00
Steven Verbeek
94fd9a6e47
Added issue description.
2012-03-17 00:24:40 -03:00
Steven Verbeek
8a9e90dac5
Changed some more wording
2012-03-16 23:48:29 -03:00
Steven Verbeek
b6fdb8557b
Changed title to issue message (name) and changed Save to Submit new issue.
2012-03-16 23:43:28 -03:00
Steven Verbeek
f59ec80412
Fix for search input when focused, no longer turns blue.
2012-03-16 22:40:36 -03:00
Dmitriy Zaporozhets
341b4414ea
styled title block for mr, issue, commit
2012-03-16 21:11:03 +03:00
Dmitriy Zaporozhets
2ec12c9bb8
Impoved merge requests show page. Minor style improvements across project
2012-03-16 01:45:46 +02:00
Dmitriy Zaporozhets
7f76d6cfee
counters for dashboard panel
2012-03-16 01:31:46 +02:00
Dmitriy Zaporozhets
5d2bd5ec3a
Simple search implementation
2012-03-16 01:14:39 +02:00
Dmitriy Zaporozhets
b2c13bdd77
button styled
2012-03-15 23:44:04 +02:00
Dmitriy Zaporozhets
7b75f3cfd3
show who merged request
2012-03-15 23:32:00 +02:00
Dmitriy Zaporozhets
828f84fdb3
fixed merge request notes hide
2012-03-15 23:01:50 +02:00
Dmitriy Zaporozhets
2e2e0522d4
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-03-15 19:39:28 +02:00
Ariejan de Vroom
cbc56a96ac
Updated upvotes view for issue and merge request show
2012-03-15 13:03:56 +02:00
Dmitriy Zaporozhets
5a3f23f395
Persist Merge Request diff. Auto merge request close on push
2012-03-15 00:57:43 +02:00
Ariejan de Vroom
27e3699814
Links +upvote buttons directly to the notes section
2012-03-15 00:56:42 +02:00
Ariejan de Vroom
2d00f2dfe4
Added 'x notes' and +1 counters to issues and merge requests. Refs #549
2012-03-15 00:51:03 +02:00
Ariejan de Vroom
8d8b82127f
Count +1 votes in issue notes.
2012-03-14 15:31:31 +02:00
Ariejan de Vroom
ed11ca13e8
Added form hint about markdown for the project description
2012-03-14 12:39:33 +02:00
Ariejan de Vroom
317963b1ab
Use markdown to render the project description.
2012-03-14 12:34:03 +02:00
Dmitriy Zaporozhets
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets
781f5aa6fb
classic theme improved, images refactored
2012-03-13 22:17:13 +02:00
Dmitriy Zaporozhets
e44ee826ac
tree browse -> file icons
2012-03-12 23:52:10 +02:00
Loïc Gerbaud
3ae93e6f97
Typo : "vist" -> "visit" on dashboard
2012-03-12 13:15:48 +01:00
Andrey Janzen
34ea7fdb36
fix typo
2012-03-12 09:02:05 +07:00
Dmitriy Zaporozhets
af0b65ddb8
projects page improved
2012-03-11 11:46:15 +02:00
Dmitriy Zaporozhets
4d24c3bb21
fixed snippet show
2012-03-10 23:57:53 +02:00
Dmitriy Zaporozhets
a10ad7183e
Usability improved. Nothing to show messages for issues, MR
2012-03-10 23:41:05 +02:00
Dmitriy Zaporozhets
bd7359b50e
fix text color for account popup hover
2012-03-10 22:59:14 +02:00
Dmitriy Zaporozhets
620e83d01a
fixed line height for top panel
2012-03-10 11:32:43 +02:00
Dmitriy Zaporozhets
5e1b9360b4
main menu css updated
2012-03-10 00:47:59 +02:00
Dmitriy Zaporozhets
cd06d6edac
Project model refactored
2012-03-09 21:43:46 +02:00
Dmitriy Zaporozhets
51f7d94991
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-03-09 20:05:07 +02:00
Dmitriy Zaporozhets
fc058605c2
fixed app crash if edit empty project from admin
2012-03-09 20:04:26 +02:00
Dmitriy Zaporozhets
3c3d26f3e7
Merge pull request #529 from abhid/branch-commit-url-fix
...
This might fix the issue with commits showing up in the format.
2012-03-08 02:08:25 -08:00
Dmitriy Zaporozhets
d4ebde9378
help updated
2012-03-08 00:15:31 +02:00
Dmitriy Zaporozhets
a9ef0bc343
test fix, css refactoring
2012-03-07 23:55:46 +02:00
Abhi Devireddy
32f04fc345
This might fix the issue with commits showing up in the format.
...
Needs to be tested.
2012-03-07 11:41:39 -06:00
Dmitriy Zaporozhets
c9b64974c0
increased dashboard width
2012-03-07 00:16:43 -08:00
Dmitriy Zaporozhets
57ce7124fc
Fixed invalid commit show if git history broken
2012-03-07 00:15:43 -08:00
Dmitriy Zaporozhets
94befdd502
Events improved. Open/close issue, merge request events displayed
2012-03-07 00:13:43 -08:00
Dmitriy Zaporozhets
98b484b996
Merge pull request #520 from abhid/default-ssh-username
...
Removed hardcoded SSH Username on project create/edit form. Fixes Issue #493
2012-03-07 00:12:43 -08:00
Abhi Devireddy
1bc0bd3244
Adapt to new web_hook_data method
...
Uses the first key that the user has for testing post receive hook.
2012-03-06 22:26:39 -06:00
Abhi Devireddy
a7c8ce6a4d
Removed hardcoded SSH Username on project create/edit form
2012-03-06 17:39:07 -06:00
Dmitriy Zaporozhets
eb7bbedb20
Polishin & fixed tree switch
2012-03-06 00:29:40 +02:00
Dmitriy Zaporozhets
cb59aade4e
Cleaning and refactoring
2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets
74f8bc7298
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-03-06 00:16:40 +02:00
Uwe Kleinmann
eac366a97b
Sets correct content type on web hook execution.
2012-03-05 02:38:18 +01:00
Dmitriy Zaporozhets
0727edd8a0
Removed issues,mr delete buttons. Refactored models
2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets
3fe9d2972f
2.3.0 pre
2012-03-04 12:35:15 +02:00
Dmitriy Zaporozhets
bc6915f24a
projects page finished
2012-03-04 03:00:19 +02:00
Dmitriy Zaporozhets
d6b051c5be
get rid of sidebar
2012-03-03 13:03:03 +02:00
Dmitriy Zaporozhets
62707bb730
fixed invalid issues link on dashboard
2012-03-03 11:23:03 +02:00
Dmitriy Zaporozhets
6de7dc1e67
New projects page
2012-03-03 00:09:17 +02:00
Dmitriy Zaporozhets
9f1a5f415a
Key uniq method refactored
2012-03-02 22:44:30 +02:00
Dmitriy Zaporozhets
2d162ff9ac
Fix for mysql database cause key is a reserved word
2012-03-02 22:33:29 +02:00
Dmitriy Zaporozhets
5263dd4297
Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled
2012-03-01 22:43:04 +02:00
Dmitriy Zaporozhets
00028702fc
design tab improved. Themes added
2012-03-01 21:23:50 +02:00
Dmitriy Zaporozhets
375ebcabfd
improved activity ui
2012-03-01 20:47:57 +02:00
Dmitriy Zaporozhets
c94159ab08
improved dashboard
2012-03-01 20:40:32 +02:00
Ariejan de Vroom
b0ce61c4f2
Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique
...
Added/fixed specs
Update spec/factory to allow Factory#new without opts
Conflicts:
app/models/key.rb
2012-03-01 16:00:14 +01:00
Ariejan de Vroom
df6f748179
Merge pull request #459 from patthoyts/pt/gravatar-fix
...
Generate consistent gravatar hash values as per documentation.
2012-03-01 06:03:48 -08:00
Dmitriy Zaporozhets
1924de91c5
fixed compare for push
2012-02-29 23:34:06 +02:00
Dmitriy Zaporozhets
f6f939eeb8
UI mars theme updated. search field improved
2012-02-29 23:21:23 +02:00
Dmitriy Zaporozhets
25bde28d13
Fixed tests. removed delegate to id
2012-02-29 23:04:09 +02:00
Dmitriy Zaporozhets
bb164ebf1b
Send author to post hook. Display push activity to dashboard
2012-02-29 22:38:24 +02:00
Dmitriy Zaporozhets
0a0710a548
Event entity created
...
Observe issue, merge request, note creation - create event
register push event
2012-02-29 11:15:58 +02:00
Dmitriy Zaporozhets
85954621a3
new UI theme - mars
2012-02-29 00:45:38 +02:00
Dmitriy Zaporozhets
93a5b3d811
Merge pull request #485 from deanperry/master
...
Fixed spelling mistake - 'yo tour' to 'to your'
2012-02-28 13:12:08 -08:00
Dmitriy Zaporozhets
a1385d11ac
hide admin link for users
2012-02-28 23:08:11 +02:00
Dmitriy Zaporozhets
5c2e89b279
reduced number of recent projects for dashboard to 5
2012-02-28 23:01:50 +02:00
Dmitriy Zaporozhets
376bec26de
Added dashboard page. Projects page not root from now
2012-02-28 22:59:36 +02:00
Dean Perry
b9e23b906e
fixed spelling mistake - 'Ream more' to 'read more'
2012-02-28 19:35:35 +00:00
Dean Perry
c9c292f350
fixed spelling mistake - 'yo tour' to 'to your'
2012-02-28 19:31:27 +00:00
Dmitriy Zaporozhets
34e1580184
Improved file browse page, prepared for downloads tab
2012-02-28 00:00:19 +02:00
Dmitriy Zaporozhets
bcf03b5de6
tree css fixes
2012-02-27 20:51:12 +02:00
Dmitriy Zaporozhets
8716fc78f3
Added loading animation for notes
2012-02-27 20:44:13 +02:00
Dmitriy Zaporozhets
cd5c4bac50
notes count for wall
2012-02-27 20:34:55 +02:00
Dmitriy Zaporozhets
8470d70da6
notes controller refactored
2012-02-27 20:29:27 +02:00
Dmitriy Zaporozhets
1e689bfba3
fixed notes logic
2012-02-27 19:05:27 +02:00
Dmitriy Zaporozhets
f0f14c8eab
finished scss refactoring
2012-02-27 00:41:53 +02:00
Dmitriy Zaporozhets
3a4b4fb4cd
Moving ui styles to one scss file, Added ui class to body
2012-02-27 00:21:53 +02:00
Dmitriy Zaporozhets
065c200c33
removed unnecessary hr tags & titles
2012-02-26 22:06:40 +02:00
Dmitriy Zaporozhets
1e8b111be8
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-02-26 21:39:13 +02:00
Dmitriy Zaporozhets
f403da73f5
Fixed ajax loading image. Fixed wrong wording
2012-02-26 21:38:45 +02:00
Dmitriy Zaporozhets
e6ea73c776
Merge pull request #468 from bencevans/patch-1
...
Title for a link fixed
2012-02-25 13:12:49 -08:00
bgondy
0347fe2412
Update app/views/projects/team.html.haml
2012-02-25 16:41:58 +01:00
Ben Evans
2b5c61bdec
Title for a link fixed
2012-02-25 11:03:44 +00:00
Dmitriy Zaporozhets
460eeb13b7
Increased count of notes loaded when visit wall page
2012-02-24 22:48:27 +02:00
Dmitriy Zaporozhets
21c141afb1
Merge branch 'notes_refactoring'
2012-02-24 22:39:51 +02:00
Dmitriy Zaporozhets
292a41cbe2
Fixed comments for snippets. Tests fixed
2012-02-24 22:36:44 +02:00
Dmitriy Zaporozhets
d41d8ffb02
Reply button, Comments for Merge Request diff
2012-02-24 22:19:47 +02:00
Christos Trochalakis
e42fb4fda4
Fix broken commit link in branches page
2012-02-24 17:27:44 +02:00
Dmitriy Zaporozhets
215a01f63c
move notes login to one controller
2012-02-24 09:16:06 +02:00
Dmitriy Zaporozhets
81092c0198
Status codes for errors, New error pages
2012-02-23 21:04:20 +02:00
Pat Thoyts
2be4fe2858
Generate consistent gravatar hash values as per documentation.
...
The gravatar documentation on implementing the hash specifies that leading
and trailing whitespace must be trimmed and all characters should be forced
to lowercase.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
2012-02-23 16:07:54 +00:00
Cedric Gatay
6ea87c47f0
Incorrect line numbering in diff
...
When displaying a diff, the line number always starts at one, even if the first diff is not at the first line
Fixes this to display correct line numbering on first diff
2012-02-22 16:04:41 +01:00
Dmitriy Zaporozhets
7d279f9302
better error handling for not found resource, gitolite error
2012-02-22 07:14:54 +02:00
Dmitriy Zaporozhets
8c40aab120
Abilities extended. Resources security improved
2012-02-22 00:31:18 +02:00
Dmitriy Zaporozhets
af82b6773b
btn padded class
2012-02-21 23:09:46 +02:00
Dmitriy Zaporozhets
fb17234b05
separated buttons for sidebar
2012-02-21 22:51:18 +02:00
Dmitriy Zaporozhets
9803e0885e
Project sidebar improved
2012-02-21 22:46:34 +02:00
Dmitriy Zaporozhets
1c22d4f50f
Help message for wiki, styled projects page
2012-02-21 22:04:01 +02:00
Dmitriy Zaporozhets
ce8eba8913
Merge branch 'wiki'
...
Conflicts:
app/views/layouts/_project_menu.html.haml
2012-02-21 20:32:43 +02:00
Dmitriy Zaporozhets
5c492a7089
make issue, commit row title color lighter
2012-02-20 21:50:11 +02:00
Dmitriy Zaporozhets
29c41e9a0e
pollishing UI
2012-02-20 21:38:59 +02:00
Dmitriy Zaporozhets
6a445b4200
fixed forgot password form
2012-02-20 20:37:37 +02:00
Dmitriy Zaporozhets
49d58492f2
Wiki abilities
2012-02-20 21:16:55 +03:00
Dmitriy Zaporozhets
22f4c1908d
Some css fixes
2012-02-20 20:04:03 +02:00
Dmitriy Zaporozhets
3a33795f2b
css shadow for some components
2012-02-20 19:59:39 +02:00
vsizov
bdc42488e9
wiki is done
2012-02-20 20:16:55 +03:00
Dmitriy Zaporozhets
5f4a7c3e04
Home tab added, Repository tab removed\n Ability to download branch
2012-02-20 08:38:03 +02:00
Dmitriy Zaporozhets
40ac2ebc21
fixed bug with branch/commit detection in select
2012-02-20 10:38:03 +02:00
Valery Sizov
2e1f119f22
wiki: markdown support
2012-02-19 22:19:31 +02:00
Valery Sizov
d68f8401b3
wiki: improve history
2012-02-19 21:56:18 +02:00
Valery Sizov
85974948e7
Wiki: history
2012-02-19 21:52:05 +02:00
Dmitriy Zaporozhets
313d96e42b
fixed mr counter for main menu
2012-02-19 21:34:59 +02:00
Dmitriy Zaporozhets
635d3e09b7
Issues, Merge Requests counters
2012-02-19 21:30:31 +02:00
Valery Sizov
b565cd1972
Wiki: fixed main menu
2012-02-19 21:16:29 +02:00
Valery Sizov
40ce6c9131
Wiki: remove notice line
2012-02-19 19:55:37 +02:00
Valery Sizov
57271da612
Wiki: design fixed
2012-02-19 19:50:13 +02:00