Sytse Sijbrandij
b80dd3d242
Non-interactive AWS install by running a single script.
...
Merge branch 'master' into non-interactive-aws-install
Conflicts:
doc/installation.md
Fix merge mess in installation.md
2012-09-02 18:39:50 +02:00
randx
8eaead6a01
Text message for mergeing MR
2012-08-19 00:45:46 +03:00
Robert Speicher
6af38f5145
"Cant" -> "Can't"
2012-08-13 21:02:40 -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
Riyad Preukschas
eb06dd79f8
Update views for GFM
2012-08-02 02:54:57 +02:00
Riyad Preukschas
e6bb4f1491
Update links to merge requests
2012-07-25 21:11:58 +02: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
Dmitriy Zaporozhets
2a705c4f40
Admin logs improved. Commits list box styled
2012-07-16 08:03:10 +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
df6a75d52d
buttons margin fixed
2012-07-05 09:35:23 +03:00
randx
264ee0c5a1
Tabs styled. MR Get Patch
2012-07-05 01:26: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
randx
2def1c7217
Merge Request -> show. Refactored. f5 support for diff
2012-06-29 21:55:22 +03:00
randx
283bf80676
Comment icons for Issues, MR lists
2012-06-26 21:20:05 +03:00
randx
0321a3c9b4
MR: merged badge. Removed colors from MR list
2012-06-26 19:08:44 +03:00
Dmitriy Zaporozhets
75cf927d3b
Issues & MR legend
2012-06-21 08:29:53 +03:00
Zevs
5fd2f7158e
remove double negative
2012-06-21 00:21:13 +03:00
randx
1a05f2f7c9
Get rid of deprecated link_to_function
2012-06-20 21:29:55 +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
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
36e88b960a
CSS refactoring
2012-06-13 20:02:30 +03:00
Dmitriy Zaporozhets
a243253b10
Refactored project archive. Improved MR usability form
2012-06-13 09:03:53 +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
randx
b826a684c7
Fix MR modal bug
2012-05-30 19:46:09 +03:00
randx
89043d6b89
MR: Accept section polished. Show permission info
2012-05-28 20:19:54 +03:00
Dmitriy Zaporozhets
ddc7568fec
Milestone show, Team index: Better UI
2012-05-24 09:23:52 +03: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
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
5ef3b38429
MR commits suppressed if too many. few icons
2012-04-17 22:08:07 +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
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
Kei Kubo
700eec6672
added = preserve to some pre statements
2012-04-11 19:13:38 +00:00
Dmitriy Zaporozhets
ba3c359fd5
b2 fixes
2012-04-10 21:39:04 +03:00
randx
627efddf63
migrated to bootstrap 2
2012-04-10 08:51:08 +03:00
Dmitriy Zaporozhets
90748cf724
Merge Button v1 complete
2012-03-30 20:49:34 +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
69ef81404c
UI improved, .main_box css class for show pages
2012-03-28 10:46:51 +03:00
Dmitriy Zaporozhets
46906ca9db
Issues, Merge Request show page polished. Fixed +n overflow
2012-03-28 00:31:14 +03:00
Dmitriy Zaporozhets
7d56a51bdc
Js refactoring and ajax animation replaced
2012-03-26 21:41:58 +03:00
Dmitriy Zaporozhets
39ea486e1f
Fixed specs. Some css fixes
2012-03-25 19:44:29 +03:00