randx
528d125dbb
Merge branch 'jouve-fix_commits_dashboard'
2012-08-12 00:34:14 +03:00
Dmitriy Zaporozhets
a483090b73
Merge pull request #1224 from tsigo/omniauth_sample_syntax
...
Fix invalid syntax in OmniAuth initializer sample
2012-08-11 23:49:48 -07:00
Robert Speicher
91a8cd240b
Fix invalid syntax in OmniAuth initializer sample
2012-08-11 19:33:59 -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
28d903858e
Switch to capybara-webkit for Cucumber
2012-08-11 23:33:49 +03:00
randx
bb50917a29
Trying to prevent travis broken builds by increase capybara timout for cucumber
2012-08-11 23:17:18 +03:00
randx
44f79b2cb1
Add comments to Gemfile
2012-08-11 22:59:56 +03:00
randx
a237c802da
Rails version to 3.2.8
2012-08-11 22:48:55 +03:00
Dmitriy Zaporozhets
5867a5c21d
Merge pull request #1166 from three18ti/master
...
Updated MySQL docs and Ubuntu auto-install script
2012-08-11 12:22:03 -07:00
randx
731b6be9c9
Handle app crash on huge commits
2012-08-11 15:59:36 +03:00
Dmitriy Zaporozhets
ac525a74ee
Merge pull request #1219 from tsigo/ruby19_hashes
...
Fully embrace Ruby 1.9 hash syntax
2012-08-11 01:26:44 -07:00
Robert Speicher
42d3295d3d
Revert 1.9 Hash syntax in ValidCommit::BLOB_FILE
...
Features are still expecting the 1.8 syntax, which is fine in this case.
2012-08-10 18:38:13 -04: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
Dmitriy Zaporozhets
35b45da63e
Merge pull request #984 from abevoelker/fix-init.d-resque
...
Fix resque worker becoming paused on restarts
2012-08-10 06:26:04 -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
Dmitriy Zaporozhets
a8ce107c64
Cucumber feature -> Merge Request
2012-08-09 08:13:29 +03:00
Dmitriy Zaporozhets
ac9cec740b
Version to 2.8.0pre
2012-08-10 10:49:45 +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
Dmitriy Zaporozhets
72c6be2d1a
Merge pull request #1183 from riyad/gitlab-flavored-markdown
...
Gitlab flavored markdown
2012-08-07 12:16:36 -07: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
90c2cd1ee6
Fix GFM specs for ids in markdown headings
2012-08-06 02:31:16 +02:00
Riyad Preukschas
8e6a7a172e
Merge branch 'master' into gitlab-flavored-markdown
2012-08-06 01:48:20 +02:00
randx
c120457a6f
Add admin credentials to installation docs
2012-08-02 15:30:22 +03: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
9bf7c1ee31
Fix travis script
2012-08-04 10:13:54 +03:00
randx
9b4c41f826
Fix github issue #1190
2012-08-02 09:07:01 +03:00
randx
4a437cdf86
Remove useless Protected branch test
2012-08-02 09:05:00 +03:00
Dmitriy Zaporozhets
50831b1db2
Merge branch 'tests_cleanup' of dev.gitlabhq.com:gitlabhq
2012-08-04 06:47:58 +00:00
Dmitriy Zaporozhets
9b5441bce7
Merge pull request #1152 from natrim/master
...
Fix UMASK checking in .gitoliterc
2012-08-03 23:27:31 -07:00
Dmitriy Zaporozhets
9844ddd43f
Comments cucumber. More refactoring. Cucumber -> branches, tags
2012-08-03 19:59:55 +03:00
Dmitriy Zaporozhets
1281c122c7
Issues cucumber. refactored step_definitoons
2012-08-03 19:49:54 +03:00
Dmitriy Zaporozhets
b846ac1059
Milestones cucumber. Renamed app security test
2012-08-03 19:39:54 +03:00
