Commit graph

1276 commits

Author SHA1 Message Date
Dmitriy Zaporozhets 86676476e6 Handling big commits & big diff 2012-04-06 01:00:15 +03:00
Dmitriy Zaporozhets 17a88bb6a2 Fix mysql issue fix broken diff for Merge Request 2012-04-06 00:22:48 +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
Dmitriy Zaporozhets 3706a9744d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-04 20:03:21 +03:00
Dmitriy Zaporozhets e3845529c9 Merge pull request #634 from abevoelker/update-init-script
Add redis-server init.d dependency - fixes #598
2012-04-04 03:41:20 -07: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
Dmitriy Zaporozhets 863e5eb7d6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-04 01:03:41 +03:00
Dmitriy Zaporozhets 43f5df21a3 gitlab rake tasks refactored 2012-04-04 01:02:54 +03:00
Dmitriy Zaporozhets 69960ca1a4 Merge pull request #639 from denisnovikov/patch/utf8
Force diff line to UTF-8 encoding - proper fix.
2012-04-03 10:13:54 -07: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 f1799a239f fixed project spec 2012-04-02 08:50:37 +03:00
Abe Voelker 5d7954b532 Add redis-server init.d dependency 2012-04-01 18:59:56 -05:00
Dmitriy Zaporozhets be5359c695 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-02 00:25:01 +03:00
Dmitriy Zaporozhets 00dc34e192 Events improved & refactored. Dashboard pollished 2012-04-02 00:24:45 +03:00
Valeriy Sizov 6ce00b738e Merge pull request #631 from abevoelker/move-unicorn-unix-socket
Move Unicorn unix socket out of /tmp
2012-04-01 13:51:43 -07:00
Dmitriy Zaporozhets 3ac9c3ad7f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-04-01 22:56:31 +03:00
Abe Voelker 6aabf1157a Move Unicorn unix socket out of /tmp 2012-04-01 14:44:12 -05:00
Valeriy Sizov a8768ffb9d Merge pull request #629 from abevoelker/patch-1
Fix gl-setup PATH warning when executing gl-system-install.
2012-04-01 11:16:38 -07:00
Abe Voelker 76ebdd051f Fix gl-setup PATH warning when executing gl-system-install.
My git user uses bash (so .bash_profile), but I think it should work the same for sh shell.

Full warning message:

                ***** WARNING *****
gl-setup is not in your $PATH.

Since gl-setup MUST be run from the PATH (and not as src/gl-setup or such),
you must fix this before running gl-setup.  The simplest way is to add

    PATH=/home/git/bin:$PATH

to the end of your bashrc or similar file.  You can even simply run that
command manually each time you log in and want to run a gitolite command.

Run /home/git/gitolite/src/gl-system-install -h for a detailed usage message.
2012-04-01 13:15:18 -05: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
Dmitriy Zaporozhets 9ed5a1af2c Merge pull request #617 from iamntz/ssh_key_improvements
Automagically fills the email on add ssh key page
2012-03-30 09:15:41 -07: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
Valeriy Sizov 1031ca9b68 Merge pull request #614 from jakoch/patch-1
added nginx access_log; error_log directives for easier debugging vhost ...
2012-03-30 05:15:51 -07:00
Jens-André Koch c8f2b9cfeb added nginx access_log; error_log directives for easier debugging vhost errors
added proxy_set_header directives to prevent "ssl_error_rx_record_too_long"
added subdomain "gitlab.YOUR_SUBDOMAIN.com" to server_name directive
added "YOUR_SERVER_IP" to listen directive
2012-03-30 15:12:28 +03:00
randx 464cd59dff Rake task to provider full repo access for gitolite-owner.\n Automerge requires gitlab user be able to push to any repo 2012-03-30 08:25:04 +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
Dmitriy Zaporozhets ef32e01b4c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-28 19:31:09 +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
Ariejan de Vroom d706805c00 Added info on MySQL; Fixed formatting and language. 2012-03-28 10:07:24 +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