Dmitriy Zaporozhets
3a602c8432
Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors
...
Complete transition to using color_field for selecting colors
2015-03-24 15:27:58 -07:00
Andrew Tomaka
83b5a9ae2b
Update help texts and default value setting
2015-03-24 12:27:26 -04:00
Dmitriy Zaporozhets
2bb4ea8542
Merge branch 'notes-count-without-system' into 'master'
...
Don't include system notes in issue/MR comment count.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2163 .
See merge request !430
2015-03-24 00:10:25 +00:00
Dmitriy Zaporozhets
2cd6cc7fed
Merge branch 'improve-diff-header' into 'master'
...
Fix file mode going to next line in diff header
See merge request !432
2015-03-24 00:09:40 +00:00
Andrew Tomaka
4349e524f4
Update broadcast messages to use color_field
2015-03-23 17:22:50 -04:00
Dmitriy Zaporozhets
2953e0d19b
Merge branch 'emailsonpush-create-delete' into 'master'
...
Send EmailsOnPush email when branch or tag is created or deleted.
Addresses #1951 , #1957 and #1925 .
See merge request !1709
2015-03-23 16:48:27 +00:00
Dmitriy Zaporozhets
54326f490e
Merge branch 'no-comment-bubble' into 'master'
...
Don't show commit comment button when user is not signed in.
Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167 .
See merge request !429
2015-03-23 16:47:16 +00:00
Dmitriy Zaporozhets
c5d65ed62f
Merge branch 'userpage-activity-scroll'
...
Conflicts:
app/controllers/users_controller.rb
2015-03-23 09:45:40 -07:00
Dmitriy Zaporozhets
81d603e2c1
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-03-23 09:44:28 -07:00
Dmitriy Zaporozhets
78fe7270ab
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-03-23 09:44:20 -07:00
Dmitriy Zaporozhets
e24da35984
Merge branch 'improve-contributions-calendar' into 'master'
...
Replace commits calendar with contributions calendar
* count opening of issues and merge requests
* dont trigger git repository - use events from database
* count pushes instead of commits for faster and easier counting
* much-much faster since does not affected by repository size
See merge request !420
2015-03-23 16:40:55 +00:00
Dmitriy Zaporozhets
61700f619c
Fix file mode going to next line in diff header
2015-03-23 09:38:52 -07:00
vichak
e5b8cf0a8f
Fix #8966 Remove Milestones/Labels from project navbar when Isses disabled
2015-03-23 16:48:50 +01:00
Douwe Maan
6b92236eeb
Don't include system notes in issue/MR comment count.
2015-03-23 16:43:08 +01:00
Douwe Maan
a30645c68f
Don't show commit comment button when user is not signed in.
2015-03-23 16:17:10 +01:00
Stan Hu
a3daead1b0
Include missing events and fix save functionality in admin service template settings form
...
Closes #1275
2015-03-23 05:51:38 -07:00
vichak
a793c06532
Fix #8966 Remove Milestones ans Labels from project navbar when Issues disabled
2015-03-23 10:38:33 +01:00
Dmitriy Zaporozhets
9e554a5223
Update views to single form of address. Change "my" to "your"
2015-03-22 20:10:12 -07:00
Dmitriy Zaporozhets
9968250211
Add inifinite scroll to user activity on user page
2015-03-22 15:40:26 -07:00
Dmitriy Zaporozhets
8494170550
Improve contribution calendar per day info
2015-03-22 14:52:44 -07:00
Dmitriy Zaporozhets
54aca18cf8
Contribution calendar will use events instead of commits to count contributions
2015-03-22 14:35:27 -07:00
Dmitriy Zaporozhets
43afe46bbd
Refactor contributions events and write tests for calendar
2015-03-22 13:55:00 -07:00
Stan Hu
90cbb73ed6
Fix "Import projects from" button to show the correct instructions
...
Closes #1267
2015-03-22 08:47:22 -07:00
Dmitriy Zaporozhets
64891c6c40
Replace commits calendar with contributions calendar
...
* count opening of issues and merge requests
* dont trigger git repository - use events from database
* much-much faster since does not affected by repository size
2015-03-21 23:48:08 -07:00
Dmitriy Zaporozhets
777c119fd2
Restyle oauth accounts at profile page and add ability to unlink account
2015-03-21 17:46:00 -07:00
Dmitriy Zaporozhets
beece83af1
Improve header with avatar for group and user pages
2015-03-20 20:15:13 -07:00
Dmitriy Zaporozhets
f0d052b6e7
Merge branch 'user-location' into 'master'
...
Location field in user profile
Twitter allows you to set string with location information.
I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things.
See merge request !411
2015-03-21 00:54:03 +00:00
Dmitriy Zaporozhets
d85f396fe5
Add location to user page
2015-03-20 16:55:20 -07:00
Dmitriy Zaporozhets
6ef20926ee
Add location to user profile
2015-03-20 16:52:23 -07:00
Dmitriy Zaporozhets
9f9fed4fa2
Fix votes inline rendering
2015-03-20 15:34:29 -07:00
Dmitriy Zaporozhets
085e5084a8
Make issue and merge request sidebar more compact
...
* move votes block to participants
* make smaller font in sidebar
2015-03-20 12:50:45 -07:00
Dmitriy Zaporozhets
915c7b9455
Merge branch 'update_ui' into 'master'
...
Remove mention of branch to commit to when new file is added through UI
See merge request !1731
2015-03-20 01:28:47 +00:00
Dmitriy Zaporozhets
479020ec6b
Fix project issues and merge requests pages
2015-03-19 18:27:26 -07:00
Dmitriy Zaporozhets
ad2720aea8
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-03-19 17:53:48 -07:00
Marin Jankovski
a879d93378
Remove mention of branch to commit to.
2015-03-19 17:43:21 -07:00
Dmitriy Zaporozhets
00c042ea7c
Merge pull request #8772 from awiddersheim/fix/grammar_projects_show
...
Fix small grammar issue on projects show page
2015-03-19 16:17:37 -07:00
Dmitriy Zaporozhets
df8b4ab459
Merge pull request #8662 from yglukhov/mr-and-issue-links
...
Make MR and issue numbers clickable links in MR and issue lists.
2015-03-19 15:17:07 -07:00
Dmitriy Zaporozhets
82d4760d0d
Merge branch 'import-button' into 'master'
...
Move "Import existing repository by URL" option to button.
The "Import existing repository URL" (with or without form visible) looked out place with the new import buttons. I moved it to a button, and moved the form to below the buttons.
@dzaporozhets Would be nice to have in 7.9 since the moved buttons are in there as well.
Before:
After:
("publically" typo has been fixed to "publicly")
See merge request !1728
2015-03-19 19:03:43 +00:00
Valery Sizov
19032c0319
add canceled CI status
2015-03-19 18:27:24 +02:00
Douwe Maan
e23a1e448b
Clear up import help.
2015-03-19 16:14:37 +01:00
Douwe Maan
b298758b44
Move "Import existing repository by URL" option to button.
2015-03-19 15:06:05 +01:00
Dmitriy Zaporozhets
4595d5bf4a
Merge branch 'show_test_settings_button' into 'master'
...
Show test settings as disabled when service cannot be tested.
See merge request !1725
2015-03-19 05:24:40 +00:00
Marin Jankovski
5aa97ce91b
Show test settings as disabled when service cannot be tested.
2015-03-18 21:47:17 -07:00
Dmitriy Zaporozhets
f3d5046196
Return compare code button to top of sidebar
2015-03-18 21:32:23 -07:00
Dmitriy Zaporozhets
fa7ee3ade8
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-03-18 21:16:43 -07:00
Dmitriy Zaporozhets
3ab7933cc8
Merge branch 'improve-ui' into 'master'
...
Improve UI
* Improve group rename warning
* Refactor select css. Make selects same width
See merge request !400
2015-03-19 04:16:28 +00:00
Dmitriy Zaporozhets
ba39ca9f4a
Fix project name overflow on dashboard
2015-03-18 21:05:39 -07:00
Dmitriy Zaporozhets
e25b1107c8
Refactor select css. Make selects same width
2015-03-18 20:46:26 -07:00
Dmitriy Zaporozhets
b908d00f5b
Improve group rename warning
2015-03-18 20:16:36 -07:00
Dmitriy Zaporozhets
1cf138170c
Add tooltip for comment toggle in diff. Add changelog item and fix tests
2015-03-18 20:12:19 -07:00
Dmitriy Zaporozhets
Andrew Tomaka
Dmitriy Zaporozhets
vichak
Douwe Maan
Stan Hu
Marin Jankovski
Valery Sizov
