summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-14207-537/+723
* Show tooltips on collapsed sidebarDmitriy Zaporozhets2015-02-132-1/+5
* Merge branch 'oauth-password-http' into 'master'Dmitriy Zaporozhets2015-02-1312-22/+60
|\
| * Allow users that signed up via OAuth to set their password in order to use Gi...Douwe Maan2015-02-1312-22/+60
* | Merge branch 'username-namespace-clash' into 'master'Dmitriy Zaporozhets2015-02-132-2/+7
|\ \
| * | Prevent autogenerated OAuth username to clash with existing namespace.Douwe Maan2015-02-132-2/+7
| |/
* | Merge branch 'test_settings' into 'master'Dmitriy Zaporozhets2015-02-132-1/+24
|\ \
| * | Fix rubocop error.Marin Jankovski2015-02-121-1/+1
| * | Try to test settings added in the service.Marin Jankovski2015-02-122-1/+24
* | | Merge branch 'add_tracker_integration_doc' into 'master'Dmitriy Zaporozhets2015-02-133-1/+19
|\ \ \
| * | | Explained in the integration documentation how to enable external issue trackerMarin Jankovski2015-02-123-1/+19
| |/ /
* | | Merge branch 'signin-page-headings' into 'master'Dmitriy Zaporozhets2015-02-136-30/+32
|\ \ \
| * | | Move OAuth signin options just below signin box.Douwe Maan2015-02-135-24/+19
| * | | Add headings to signin/signup blocks on signin page.Douwe Maan2015-02-133-6/+13
| | |/ | |/|
* | | Merge branch 'dashboard-new-project' into 'master'Dmitriy Zaporozhets2015-02-132-3/+9
|\ \ \
| * | | Add "New Project" button to dashboard projects page.Douwe Maan2015-02-132-3/+9
| |/ /
* | | Link head panel titles to relevant root page.Douwe Maan2015-02-1311-10/+12
|/ /
* | Merge branch 'clean-oauth-username' into 'master'Dmitriy Zaporozhets2015-02-131-0/+16
|\ \
| * | Clean username acquired from OAuth/LDAP.Douwe Maan2015-02-121-0/+16
* | | Merge pull request #8779 from KelvinMutuma/show-assignees-in-merge-requests-i...Dmitriy Zaporozhets2015-02-121-2/+4
|\ \ \
| * | | Show Work In progress if a merge request is not assignedKelvin Mutuma2015-02-121-0/+2
| * | | Show assignees in the merge-requests indexKelvin Mutuma2015-02-121-2/+2
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-02-122-4/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-02-122-4/+17
| |\ \ \
| | * | | Change label color text field type to "color"Benjamin Kammerl2015-02-111-1/+1
| | * | | Reorders label colors for better "rainbow"phortx2015-01-131-8/+8
| | * | | Add more label color suggestionsphortx2015-01-131-1/+14
* | | | | Merge branch 'issues_tracker_template' into 'master'Dmitriy Zaporozhets2015-02-1229-48/+233
|\ \ \ \ \
| * | | | | Use the service_name.Marin Jankovski2015-02-121-2/+2
| * | | | | All services can have templates.Marin Jankovski2015-02-124-14/+26
| * | | | | Remove unecessary icon.Marin Jankovski2015-02-111-1/+0
| * | | | | Annotate services. Add a link to service template.Marin Jankovski2015-02-1122-50/+53
| * | | | | Add admin services templates.Marin Jankovski2015-02-118-11/+156
| * | | | | Remove not null constraint on project_id in services.Marin Jankovski2015-02-111-2/+2
| * | | | | Add template boolean to services.Marin Jankovski2015-02-111-1/+1
| * | | | | Add ExternalIssue base model to make issue referencing more robust for extern...Marin Jankovski2015-02-112-3/+29
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ssh-link' into 'master'Dmitriy Zaporozhets2015-02-111-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix link to SSH help page.Douwe Maan2015-02-111-1/+1
| |/ / /
* | | | Merge branch 'mobile-maximum-scale-1' into 'master'Dmitriy Zaporozhets2015-02-113-1/+6
|\ \ \ \
| * | | | Add horizontal scrolling to code blocks.Douwe Maan2015-02-112-0/+5
| * | | | Don't allow page to be scaled on mobile.Douwe Maan2015-02-091-1/+1
* | | | | Merge branch 'fix-command-enter' into 'master'Dmitriy Zaporozhets2015-02-111-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Actually submit comment on command-enter.Douwe Maan2015-02-111-1/+2
* | | | | Merge branch 'add_label_notes' into 'master'Dmitriy Zaporozhets2015-02-115-1/+53
|\ \ \ \ \
| * | | | | Add labels notesNikita Verkhovin2015-02-085-1/+53
| | |/ / / | |/| | |
* | | | | Remove settings from gitlab.yml.example which we already have in UIDmitriy Zaporozhets2015-02-101-1/+2
| |/ / / |/| | |
* | | | Default issue tracker fix for creating default issue service.Marin Jankovski2015-02-091-1/+1
* | | | Merge branch 'improve-oauth-ux' into 'master'Dmitriy Zaporozhets2015-02-091-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | When add new social account - redirect to accounts page and show notice messageDmitriy Zaporozhets2015-02-081-1/+1
* | | | Merge pull request #8580 from j0k3r/asanaDmitriy Zaporozhets2015-02-084-3/+121
|\ \ \ \