summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Notifications settings UIPhil Hughes2016-03-013-70/+72
* Password settings pagePhil Hughes2016-03-014-47/+42
* Emails settingsPhil Hughes2016-03-013-48/+51
* Applications tab on profile settingsPhil Hughes2016-03-018-86/+133
* Saves current_user on account pagePhil Hughes2016-03-011-1/+1
* Account settingsPhil Hughes2016-03-016-119/+208
* Profile settingsPhil Hughes2016-03-016-101/+122
* Merge branch 'rs-update-rails' into 'master' Dmitriy Zaporozhets2016-03-012-31/+31
|\
| * Update Rails to 4.2.5.2Robert Speicher2016-02-292-31/+31
* | Merge branch 'issue_13851' into 'master' Rémy Coutable2016-03-011-1/+14
|\ \
| * | Bring back Gitlab textissue_13851Alfredo Sumaran2016-02-291-1/+14
* | | Merge branch 'fix/contributions-forked-projects' into 'master' Douwe Maan2016-03-013-1/+20
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio...James Lopez2016-02-29194-865/+5348
| |\ \ \
| * | | | include contributions from forked projects on profile calendarJames Lopez2016-02-223-1/+20
* | | | | Merge branch 'feature/slacky-builds-v2' into 'master' James Lopez2016-03-011-1/+1
|\ \ \ \ \
| * | | | | fix syntax errorJames Lopez2016-03-011-1/+1
| * | | | | added commit message to slack scriptJames Lopez2016-03-011-1/+1
|/ / / / /
* | | | | Merge branch 'triggers_link' into 'master' Achilleas Pipinellis2016-03-011-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add link to triggers doc in variables sectionAchilleas Pipinellis2016-03-011-1/+3
* | | | | Merge branch 'issue_13212' into 'master' Jacob Schatz2016-02-293-1/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into issue_13212issue_13212Alfredo Sumaran2016-02-2956-185/+688
| |\ \ \ \ \
| * | | | | | Comment icon vertically alignedAlfredo Sumaran2016-02-291-0/+1
| * | | | | | Wrap icon with edited timeAlfredo Sumaran2016-02-292-2/+2
| * | | | | | Increase paddingAlfredo Sumaran2016-02-291-1/+1
| * | | | | | Keep edited time on the same line as wellAlfredo Sumaran2016-02-291-1/+1
| * | | | | | Apply nice date when diff page loadsAlfredo Sumaran2016-02-291-0/+1
| * | | | | | Keep date in the same lineAlfredo Sumaran2016-02-291-0/+4
| * | | | | | Prevent content misalignmentAlfredo Sumaran2016-02-291-0/+8
* | | | | | | Merge branch 'revert-6f85eb38' into 'master' Dmitriy Zaporozhets2016-02-291-4/+2
|\ \ \ \ \ \ \
| * | | | | | | Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38Dmitriy Zaporozhets2016-02-291-4/+2
* | | | | | | | Merge branch 'fix/project-wiki-ending' into 'master' Robert Speicher2016-02-293-3/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fixed merge conflict and refactored specsJames Lopez2016-02-291-6/+2
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-wik...James Lopez2016-02-2981-378/+4091
| |\ \ \ \ \ \ \
| * | | | | | | | updated internal.rb and spec based on MR feedbackJames Lopez2016-02-262-5/+11
| * | | | | | | | fix changelog [ci skip]James Lopez2016-02-251-1/+1
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-wik...James Lopez2016-02-2413-44/+71
| |\ \ \ \ \ \ \ \
| * | | | | | | | | added changelogJames Lopez2016-02-241-0/+1
| * | | | | | | | | fix for projects ending in .wikiJames Lopez2016-02-242-1/+18
* | | | | | | | | | Merge branch 'issue_5854' into 'master' Dmitriy Zaporozhets2016-02-291-2/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Add commit message to JIRA's notification payload.Rubén Dávila2016-02-261-2/+4
* | | | | | | | | | Merge branch 'issue_13648' into 'master' Dmitriy Zaporozhets2016-02-292-14/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Logged in user should be able to read internal forks.Rubén Dávila2016-02-271-1/+1
| * | | | | | | | | | Improve implementation to check read access to forks and add pagination.Rubén Dávila2016-02-262-14/+22
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix-migration' into 'master' Dmitriy Zaporozhets2016-02-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix broken migrationDmitriy Zaporozhets2016-02-291-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'removed-ngprogress' into 'master' Jacob Schatz2016-02-298-13/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed NGProgressremoved-ngprogressPhil Hughes2016-02-298-13/+8
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'too-many-changes-btns' into 'master' Jacob Schatz2016-02-291-6/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Changed too many changes buttons to whitetoo-many-changes-btnsPhil Hughes2016-02-291-6/+5
| |/ / / / / / /
* | | | | | | | Merge branch 'improve-todos-css' into 'master' Dmitriy Zaporozhets2016-02-292-35/+6
|\ \ \ \ \ \ \ \