Commit Graph
10629 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 6cf39fe10d Extract commits API to separate file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:41:21 +02:00
Dmitriy Zaporozhets ddbe978041 Complete api files CRUD
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:27:02 +02:00
Dmitriy Zaporozhets 3c742dad27 Fixed bug with json files content being escaped in api
After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 11:40:45 +02:00
Dmitriy Zaporozhets 87a449f264 Merge pull request #6321 from robertd/update_upgrader_guide
Update upgrader.md ... safety first
2014-02-18 11:29:49 +02:00
Dmitriy Zaporozhets 6f0126385d Merge pull request #6313 from jvanbaarsen/fix-6207-msi-mimetype
Fixes #6207 Allow raw download of *.msi files
2014-02-18 11:25:34 +02:00
Dmitriy Zaporozhets 767c39a325 Merge pull request #6339 from gdi2290/patch-1
update copyright year to range
2014-02-18 10:15:52 +02:00
Dmitriy Zaporozhets b939111a0c Merge pull request #6335 from jvanbaarsen/spring-binstubs
Inserted spring in the binstubs
2014-02-18 10:15:43 +02:00
Dmitriy Zaporozhets e62c87c446 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-18 09:58:12 +02:00
Dmitriy Zaporozhets 14fa0d5bd7 Merge pull request #6346 from jvanbaarsen/fix-5674-show-broadcast-everywhere
Added broadcast message on every layout file
2014-02-18 09:57:58 +02:00
Dmitriy Zaporozhets bf9372eaeb Merge branch 'password-reset-wording' into 'master'
Password Reset Wording
2014-02-18 07:15:46 +00:00
Dmitriy Zaporozhets 177b953d51 Merge branch 'improve/assignee_select' into 'master'
Improve assignee select

Fixes #1036. Fixes #1047
2014-02-18 07:15:36 +00:00
Dmitriy Zaporozhets ade780a9fe Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-18 09:04:59 +02:00
Dmitriy Zaporozhets e46883b015 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-02-18 09:04:51 +02:00
Dmitriy Zaporozhets 883c86a59e Fix notification specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 09:04:30 +02:00
Jeroen van Baarsen 4d093f9f8d Added broadcast message on every layout file
Fixes: #5674
2014-02-17 21:35:23 +01:00
Sytse Sijbrandij 96efdfade1 Merge pull request #6341 from Cynddl/feature/nofollow
Fix issue with robots constantly asking for projects archives
2014-02-17 19:11:32 +01:00
dosire e0022912d7 Better English for the password reset screen. 2014-02-17 17:30:50 +01:00
Dmitriy Zaporozhets 423dcb46ee Set initial value to Issue/MR form -> assignee selectbox
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-17 18:23:11 +02:00
Dmitriy Zaporozhets 0cc4a41d41 Merge branch 'link-to-new-installation-methods' into 'master'
Link To New Installation Methods
2014-02-17 16:10:37 +00:00
Dmitriy Zaporozhets 64dbcfe27f Revert css change done by mistake
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-17 18:09:49 +02:00
Dmitriy Zaporozhets 936353edfd Improve notification settings page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-17 18:06:24 +02:00
dosire c9b3767ff1 Double word. 2014-02-17 14:11:21 +01:00
dosire 97b47c735e Add new installation methods to the readme. 2014-02-17 12:29:56 +01:00
Cynddl 8dc3dafe24 Fix issue with robots constantly asking for projects archives 2014-02-17 11:26:33 +01:00
Dmitriy Zaporozhets 0744eac9c6 Merge pull request #6189 from jcockhren/api_ldap_check_for_user
the existence of former ldap users doesn't imply LDAP is enabled.
2014-02-17 09:26:10 +02:00
PatrickJS 10561f4c46 update copyright year to range 2014-02-16 23:06:35 -08:00
Dmitriy Zaporozhets 8136048875 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-16 19:51:39 +02:00
Dmitriy Zaporozhets e9cf2e140f Fix version sample for release candidate in monthly.md 2014-02-16 17:51:09 +00:00
Dmitriy Zaporozhets 4f4a1b961d Version to beta 2014-02-16 17:22:16 +00:00
Jeroen van Baarsen 99dc9c6fc9 Inserted spring in the binstubs
Now possible to run:
`bin/rails`
`bin/rspec`
`bin/spinach`
`bin/rake`
2014-02-16 11:22:03 +01:00
Dmitriy Zaporozhets 4bbb3d5510 Merge pull request #6333 from jvanbaarsen/added-spring
Added spring to the project
2014-02-16 11:24:26 +02:00
Dmitriy Zaporozhets 242cf70a0d Merge pull request #6334 from jvanbaarsen/scripts-to-bin
Rails uses bin folder we forgot to create it when upgrading
2014-02-16 11:24:11 +02:00
Timm Drevensek ee993dfc64 Fix branches/compare butten to directly diff to default branch 2014-02-15 22:46:02 +01:00
Dmitriy Zaporozhets 0f834d1172 Improve navbar UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 22:57:20 +02:00
Jeroen van Baarsen c35036c091 Rails uses bin folder we forgot to create it when upgrading 2014-02-15 21:03:10 +01:00
Jeroen van Baarsen 5a68db91c8 Added spring to the project 2014-02-15 20:46:15 +01:00
Dmitriy Zaporozhets 3e30b10591 Merge branch 'ui-improvements' into 'master'
Ui Improvements
2014-02-15 15:07:51 +00:00
Dmitriy Zaporozhets 99fd58ce4a Show full commit info at MR form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 14:52:33 +02:00
Dmitriy Zaporozhets 1e106756fa For form MR render only namespace name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 14:36:58 +02:00
Dmitriy Zaporozhets db961b8b46 Improve few admin pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 14:31:01 +02:00
Dmitriy Zaporozhets 1701144b41 Style pills color for violet theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 14:14:50 +02:00
Dmitriy Zaporozhets e702928fba Dark header improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 14:11:31 +02:00
Dmitriy Zaporozhets d7310fe7a9 Improve email page ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 14:01:08 +02:00
Dmitriy Zaporozhets 87415ab2a6 Add bottom margin to nav-tabs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 13:41:48 +02:00
Dmitriy Zaporozhets b6a609edbc Truncate long names for admin dashboard with css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 13:35:20 +02:00
Dmitriy Zaporozhets 5cf5c177df Merge branch 'add-margin-to-resend-form' into 'master'
Add Margin to Resend Confirmation Form

I fixed this issue on the "Reset Password"-form (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20), but found it is also occuring on the "Resend Confirmation"-form. There currently is no margin between the input (email-address) and button. This commit is a simple fix.
2014-02-14 17:26:23 +00:00
Jacob Vosmaer bbf8fd2ee4 Merge branch 'environmentize-scripts-in-script-dir' into 'master'
Environmentize Scripts In Script Dir

Updated Rails.root/scripts/{web,background_jobs} to use #!/usr/bin/env bash to allow for less OS specifcs for the location of bash, namely FreeBSD or Systems that have bash installed from source but do not have the path exported for /usr/local/{bin,sbin}
2014-02-14 15:45:32 +00:00
Pixelindustries c187d27955 Added margin between form and button in resend-confirmation form. 2014-02-14 15:45:41 +01:00
Dmitriy Zaporozhets 0331f36a2c Few responsive fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-14 15:58:15 +02:00
Dmitriy Zaporozhets e19ff109a2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-02-14 15:52:15 +02:00