summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Inserted spring in the binstubsJeroen van Baarsen2014-02-165-0/+40
| | | | | | | | Now possible to run: `bin/rails` `bin/rspec` `bin/spinach` `bin/rake`
* Merge pull request #6333 from jvanbaarsen/added-springDmitriy Zaporozhets2014-02-162-0/+12
|\ | | | | Added spring to the project
| * Added spring to the projectJeroen van Baarsen2014-02-152-0/+12
| |
* | Merge pull request #6334 from jvanbaarsen/scripts-to-binDmitriy Zaporozhets2014-02-163-0/+11
|\ \ | | | | | | Rails uses bin folder we forgot to create it when upgrading
| * | Rails uses bin folder we forgot to create it when upgradingJeroen van Baarsen2014-02-153-0/+11
| |/
* | Improve navbar UXDmitriy Zaporozhets2014-02-151-4/+16
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2014-02-1522-179/+200
|\ | | | | | | Ui Improvements
| * Show full commit info at MR formDmitriy Zaporozhets2014-02-154-12/+15
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * For form MR render only namespace nameDmitriy Zaporozhets2014-02-152-5/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve few admin pagesDmitriy Zaporozhets2014-02-153-23/+18
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Style pills color for violet themeDmitriy Zaporozhets2014-02-151-0/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Dark header improvementsDmitriy Zaporozhets2014-02-151-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve email page uiDmitriy Zaporozhets2014-02-151-4/+8
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add bottom margin to nav-tabsDmitriy Zaporozhets2014-02-159-8/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Truncate long names for admin dashboard with cssDmitriy Zaporozhets2014-02-152-126/+131
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'add-margin-to-resend-form' into 'master'Dmitriy Zaporozhets2014-02-141-1/+2
|\ | | | | | | | | | | 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.
| * Added margin between form and button in resend-confirmation form.Pixelindustries2014-02-141-1/+2
| |
* | Merge branch 'environmentize-scripts-in-script-dir' into 'master'Jacob Vosmaer2014-02-142-2/+2
|\ \ | | | | | | | | | | | | | | | 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}
| * | Updated script/{web,background_job} to use #!/usr/bin/env bash rather than ↵Matthew Trisoline2014-02-102-2/+2
| | | | | | | | | | | | #!/bin/bash to allow for transparency between OS namely Linux and FreeBSD and for source installs of bash where path is not exported by default for /usr/local/{bin,sbin}
* | | Few responsive fixesDmitriy Zaporozhets2014-02-142-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-02-141-1/+2
|\ \ \
| * \ \ Merge branch 'add-margin-to-reset-password-form' into 'master'Dmitriy Zaporozhets2014-02-141-1/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Add Margin To Reset Password Form There currently is no margin between the reset-password input (email-address) and button. This is ugly. This commit is a simple fix.
| | * | Added margin between form and button in reset-password form.Pixelindustries2014-02-111-1/+2
| | | |
* | | | More changelog entriesDmitriy Zaporozhets2014-02-141-1/+4
| | | |
* | | | Merge branch 'https-readme' into 'master'Dmitriy Zaporozhets2014-02-141-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | Https Readme
| * | | Prevent mixed content warnings.dosire2014-02-141-1/+1
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqv6.6.0.pre1Dmitriy Zaporozhets2014-02-141-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #6314 from jvanbaarsen/patch-2Sytse Sijbrandij2014-02-141-1/+1
| |\ \ \ \ | | |/ / / | |/| | | Update readme.md
| | * | | Update readme.mdJeroen van Baarsen2014-02-131-1/+1
| | | | | | | | | | | | | | | Changed `Gitter` to `Gitter chat room`
* | | | | Merge branch 'improve_large_groups' into 'master'Dmitriy Zaporozhets2014-02-1427-172/+345
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve for large groupsImprove for large groups This merge request is a set of patched to improve application for large groups with more then 100 people. Pages to be improved: :white_check_mark: Group#members page :white_check_mark: Project#issues page :white_check_mark: Project#merge_requests page :white_check_mark: Project#new_issue page :white_check_mark: Project#new_mr page :white_check_mark: Project#members page
| * | | | Dont render more than 20 group members on Project#members pageDmitriy Zaporozhets2014-02-141-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use project_users_select_tag for Issue form and MR formDmitriy Zaporozhets2014-02-144-4/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Restyle issue/mr top filters for listDmitriy Zaporozhets2014-02-137-141/+154
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add placeholder support for project_users_select_tagDmitriy Zaporozhets2014-02-133-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | project_user selectbox with ajax autocompleteDmitriy Zaporozhets2014-02-137-13/+98
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Show avatars in ajax user selectboxDmitriy Zaporozhets2014-02-133-2/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Show only people who have assigned merge requests in assignee dropdownDmitriy Zaporozhets2014-02-133-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Show only people who have assigned issues in assignee dropdownDmitriy Zaporozhets2014-02-132-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix group test for new member add procedureDmitriy Zaporozhets2014-02-131-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Adopt Group#members page for large groups (> 100 users)Dmitriy Zaporozhets2014-02-135-12/+42
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-02-1427-46/+424
|\ \ \ \ \
| * \ \ \ \ Merge branch 'feature/email-aliases' into 'master'Dmitriy Zaporozhets2014-02-1427-46/+424
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Add email aliases for users Email aliases are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. This addresses http://feedback.gitlab.com/forums/176466-general/suggestions/3692666-ability-to-have-multiple-email-address.
| | * | | | Add email aliases for usersJason Hollingsworth2014-02-1327-46/+424
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emails are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. Notifications are sent when an email is added.
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-02-145-4/+8
|\ \ \ \ \
| * \ \ \ \ Merge pull request #6315 from jvanbaarsen/fix-6311Sytse Sijbrandij2014-02-133-3/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fixes #6311: cp the init.d file locally instead of remote
| | * | | | Fixes #6311: cp the init.d file locally instead of remoteJeroen van Baarsen2014-02-133-3/+3
| |/ / / /
| * | | | Merge pull request #6310 from jvanbaarsen/add-gitter-linkSytse Sijbrandij2014-02-131-0/+2
| |\ \ \ \ | | | | | | | | | | | | Added gitter link
| | * | | | Added gitter linkJeroen van Baarsen2014-02-131-0/+2
| | |/ / /
| * | | | Merge pull request #6258 from zzet/patch-6Dmitriy Zaporozhets2014-02-131-1/+3
| |\ \ \ \ | | |/ / / | |/| | | Add emoji images to asset load path.
| | * | | Add emoji images to asset load path.Andrew Kumanyaev2014-02-061-1/+3
| | | | |
View Lorry Controller Status