summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update mail_roomupdate-mail-roomDouwe Maan2015-08-262-3/+3
* Merge branch 'update-changelog-for-7.14.1' into 'master'Robert Speicher2015-08-261-3/+3
|\
| * Update CHANGELOG for released 7.14.1Stan Hu2015-08-261-3/+3
* | Merge branch 'prevent-too-many-redirects-on-signin' into 'master'Dmitriy Zaporozhets2015-08-262-1/+4
|\ \
| * | Prevent too many redirects error when home page URL set to external_urllStan Hu2015-08-262-1/+4
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-2617-118/+105
|\ \ \
| * \ \ Merge branch 'fluid-fixed-layout' into 'master'Dmitriy Zaporozhets2015-08-2615-108/+90
| |\ \ \ | | |_|/ | |/| |
| | * | Fix header for anonymous users toofluid-fixed-layoutDmitriy Zaporozhets2015-08-261-6/+1
| | * | Align header with content containerDmitriy Zaporozhets2015-08-266-81/+67
| | * | Limit content width for big screens except certain pagesDmitriy Zaporozhets2015-08-2610-21/+22
| * | | Merge branch 'blame_fix' into 'master'Dmitriy Zaporozhets2015-08-262-1/+2
| |\ \ \
| | * | | Improve perofrmance of git blameValery Sizov2015-08-262-1/+2
| |/ / /
| * | | Merge branch 'bar-graphs' into 'master'Dmitriy Zaporozhets2015-08-262-9/+13
| |\ \ \
| | * | | Add changelog entryJosef Kufner2015-08-251-0/+1
| | * | | Change plots to bar graphsJosef Kufner2015-08-251-9/+12
| | |/ /
* | | | Merge branch 'fix' into 'master' Job van der Voort2015-08-261-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | deleted linekaren Carias2015-08-171-2/+1
| * | | fixed textkaren Carias2015-08-101-2/+3
* | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-08-265-7/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Increase width of sidebar for several pagesDmitriy Zaporozhets2015-08-263-6/+6
| * | | Improve project name/description look on project pageDmitriy Zaporozhets2015-08-262-1/+4
| | |/ | |/|
* | | Merge branch 'fix-reply-by-email-init' into 'master'Robert Speicher2015-08-251-1/+1
|\ \ \
| * | | Fix init script for Reply by emailDouwe Maan2015-08-251-1/+1
* | | | Merge branch 'dropdown-positioning' into 'master'Dmitriy Zaporozhets2015-08-253-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | UI Improvement for the project pageHannes Rosenögger2015-08-253-1/+6
* | | | Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets2015-08-256-39/+11
|\ \ \ \
| * | | | Re-use project partial for rendering explore projectsDmitriy Zaporozhets2015-08-256-39/+11
* | | | | Merge branch 'rs-re-enable-user-reference-spec' into 'master'Douwe Maan2015-08-251-1/+0
|\ \ \ \ \
| * | | | | Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
* | | | | | Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets2015-08-2518-67/+95
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |
| * | | | Fix tests and last push widgetseparate-activityDmitriy Zaporozhets2015-08-257-8/+20
| * | | | Make some visual improvements to dashboard page after we moved activityDmitriy Zaporozhets2015-08-257-44/+46
| * | | | Dashboard activity as separate pageDmitriy Zaporozhets2015-08-256-16/+30
* | | | | Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'Dmitriy Zaporozhets2015-08-254-1/+9
|\ \ \ \ \
| * | | | | Fix "Reload with full diff" URL button in compare branch viewStan Hu2015-08-244-1/+9
* | | | | | Merge branch 'improve-abuse-reports' into 'master'Dmitriy Zaporozhets2015-08-255-8/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix remove report buttonimprove-abuse-reportsDmitriy Zaporozhets2015-08-252-2/+3
| * | | | | Improve abuse reports managementDmitriy Zaporozhets2015-08-254-7/+21
* | | | | | Merge branch 'handle-smtp-input-errors' into 'master'Dmitriy Zaporozhets2015-08-253-14/+54
|\ \ \ \ \ \
| * | | | | | Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to ...Stan Hu2015-08-193-14/+54
* | | | | | | Merge branch 'upgrade-browser-gem' into 'master'Dmitriy Zaporozhets2015-08-253-3/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty modeStan Hu2015-08-233-3/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'reply-by-email-improvements' into 'master'Robert Speicher2015-08-244-0/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Ignore empty incoming messages.Douwe Maan2015-08-244-0/+10
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-changelog-update' into 'master'Robert Speicher2015-08-241-1/+1
|\ \ \ \ \
| * | | | | Move changelog entry to 7.14.1Robert Speicher2015-08-241-1/+1
|/ / / / /
* | | | | Merge branch 'rs-7-14-1-changelog' into 'master'Douwe Maan2015-08-241-1/+3
|\ \ \ \ \
| * | | | | Move full_host fix changelog entry to 7.14.1Robert Speicher2015-08-241-1/+3
|/ / / / /
* | | | | Merge branch 'fix-relative-url-omniauth' into 'master'Robert Speicher2015-08-243-9/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Only include base URL in OmniAuth full_host parameterStan Hu2015-08-233-9/+20