summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-181-0/+1
|\
| * Merge branch 'api-sort-merge-request-comments' into 'master'Douwe Maan2015-03-181-0/+1
| |\
| | * Note: add default_scope { order(created_at: :asc, id: :asc) }Samuel Bernard2015-03-181-0/+1
* | | Merge branch 'fix-mr-push-range' into 'master'Dmitriy Zaporozhets2015-03-182-3/+7
|\ \ \ | |/ / |/| |
| * | Fix condensed range in MR push comment.Douwe Maan2015-03-182-3/+7
* | | Merge branch 'changelog-link' into 'master'Dmitriy Zaporozhets2015-03-186-41/+105
|\ \ \
| * | | Add license and contribution guide links to project sidebar.Douwe Maan2015-03-185-17/+64
| * | | Show changelog link even if no version is known.Douwe Maan2015-03-181-3/+7
| * | | Fix tree readme.Douwe Maan2015-03-181-4/+10
| * | | Link project version to changelog if there is one.Douwe Maan2015-03-182-2/+10
| * | | Find tree readme lazily.Douwe Maan2015-03-181-20/+19
| * | | Move finding of contributing file from tree to repository.Douwe Maan2015-03-182-7/+7
| |/ /
* | | Merge branch 'new-branch-commits' into 'master'Dmitriy Zaporozhets2015-03-183-4/+10
|\ \ \
| * | | List new commits for newly pushed branch in activity view.Douwe Maan2015-03-183-4/+10
| |/ /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-1810-47/+132
|\ \ \ | | |/ | |/|
| * | Merge branch 'commit_calendar_activity' into 'master'Douwe Maan2015-03-188-27/+131
| |\ \
| | * | Extend the commit calendar to show the actual commits for a dateHannes Rosenögger2015-03-188-27/+131
| | |/
| * | enable line wrapping by default and remove the checkbox to change itHannes Rosenögger2015-03-182-20/+1
| |/
* | Fix the order of signin and signup on features page.Marin Jankovski2015-03-181-2/+2
|/
* Merge branch 'fix_subscription' into 'master'Dmitriy Zaporozhets2015-03-182-26/+28
|\
| * fix public issueValery Sizov2015-03-182-26/+28
* | Fix external wiki serviceDmitriy Zaporozhets2015-03-172-2/+2
* | Remove to old GitLab colors for succes and primaryDmitriy Zaporozhets2015-03-173-10/+5
* | Cleanup bootstrap variable example filerefactor-cssDmitriy Zaporozhets2015-03-171-741/+4
* | More use of sass variables. Reject flatly gray colorsDmitriy Zaporozhets2015-03-175-24/+17
|/
* Align services like in EE for easier mergingDmitriy Zaporozhets2015-03-171-4/+22
* Merge branch 'external_wiki' into 'master'Dmitriy Zaporozhets2015-03-185-2/+62
|\
| * Add a service to support external wikisHannes Rosenögger2015-03-125-2/+62
* | Fix email template css for project moved emailsDmitriy Zaporozhets2015-03-171-2/+2
* | Merge branch 'css-vars' into 'master'Dmitriy Zaporozhets2015-03-1810-31/+31
|\ \
| * | More actively use css variabled to prevent colors duplicationDmitriy Zaporozhets2015-03-1710-31/+31
* | | Fix scroll for last push widgetDmitriy Zaporozhets2015-03-171-1/+3
|/ /
* | Merge branch 'fix_service_trigger_ui' into 'master'Douwe Maan2015-03-172-6/+6
|\ \
| * | Fix UI bug regarding servicesDrew Blessing2015-03-172-6/+6
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-174-4/+4
|\ \ \ | |/ /
| * | Merge branch 'atom-xhtml-squashed' into 'master'Douwe Maan2015-03-174-4/+4
| |\ \
| | * | Fix invalid Atom feeds when using emoji, horizontal rules, or images.Christian Walther2015-03-164-4/+4
* | | | Merge branch 'last-deploy-key' into 'master'Dmitriy Zaporozhets2015-03-172-2/+10
|\ \ \ \
| * | | | Satisfy Rubocop.Douwe Maan2015-03-171-2/+1
| * | | | Delete deploy key when last connection to a project is destroyed.Douwe Maan2015-03-172-2/+11
| |/ / /
* | | | Merge branch 'issue_subscription' into 'master'Dmitriy Zaporozhets2015-03-178-2/+138
|\ \ \ \ | |/ / / |/| | |
| * | | improve UIValery Sizov2015-03-173-18/+26
| * | | testsValery Sizov2015-03-168-22/+36
| * | | fix specsValery Sizov2015-03-162-11/+21
| * | | rename table subscribe; make it polymorficValery Sizov2015-03-168-22/+24
| * | | code folding fixValery Sizov2015-03-163-8/+11
| * | | SubscriptionValery Sizov2015-03-158-2/+101
* | | | Properly align save user profile buttonDmitriy Zaporozhets2015-03-171-2/+4
* | | | Fix button color inside alertDmitriy Zaporozhets2015-03-161-1/+1
* | | | Merge branch 'fix-null-visibility' into 'master'Dmitriy Zaporozhets2015-03-173-5/+9
|\ \ \ \